[gimp/soc-2010-cage] Updated Thai translation.

[Michael Muré <mmure src gnome org>]

commit cdf40ca1e6148fe05cb4e4cd4852028996f21874
Author: Sira Nokyoongtong <gumaraa gmail com>
Date:   Fri Jun 4 20:24:23 2010 +0700

    Updated Thai translation.

 po/th.po |13459 ++++++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 9495 insertions(+), 3964 deletions(-)
---
diff --git a/po/th.po b/po/th.po
index b24d9c0..3d831d8 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,46 +1,47 @@
 # Thai translation of gimp
 # This file is distributed under the same license as the gimp package.
-# Copyright (C) 2005-2006 Free Software Foundation, Inc.
+# Copyright (C) 2005-2010 Free Software Foundation, Inc.
 # Arnon Namsanit <teddy nams gmail com>, 2005.
 # Supranee Thirawatthanasuk <supranee opentle org>, 2006.
 # Arnon Namsanit <arnon namsanit nectec or th>, 2006.
 # Kamthorn Krairaksa <kamthorn gmail com>, 2006.
+# Sira Nokyoongtong <gumaraa gmail com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-2006-08\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-29 11:29+0700\n"
-"PO-Revision-Date: 2006-08-25 19:08+0700\n"
-"Last-Translator: Kamthorn Krairaksa <kamthorn gmail com>\n"
-"Language-Team: Thai <l10n opentle org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=gimp&component=general\n"
+"POT-Creation-Date: 2010-06-01 19:22+0000\n"
+"PO-Revision-Date: 2010-06-04 20:08+0700\n"
+"Last-Translator: Sira Nokyoongtong <gumaraa gmail com>\n"
+"Language-Team: Thai <thai-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
-"Plural-Forms: plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../app/about.h:24
+#: ../app/about.h:23
 msgid "GIMP"
 msgstr "GIMP"
 
-#: ../app/about.h:27 ../desktop/gimp.desktop.in.in.h:2
+#: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:2
 msgid "GNU Image Manipulation Program"
 msgstr "GNU Image Manipulation Program"
 
-#: ../app/about.h:30
+#: ../app/about.h:29
 msgid ""
-"Copyright © 1995-2006\n"
+"Copyright © 1995-2009\n"
 "Spencer Kimball, Peter Mattis and the GIMP Development Team"
 msgstr ""
-"Copyright © 1995-2006\n"
+"Copyright © 1995-2009\n"
 "Spencer Kimball, Peter Mattis and the GIMP Development Team"
 
-#: ../app/about.h:34
+#: ../app/about.h:33
 msgid ""
-"GIMP is free software; you can redistribute it and/or modify it under the "
+"GIMP is free software: you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
+"Foundation; either version 3 of the License, or (at your option) any later "
 "version.\n"
 "\n"
 "GIMP is distributed in the hope that it will be useful, but WITHOUT ANY "
@@ -49,27 +50,21 @@ msgid ""
 "details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with "
-"GIMP; if not, write to the Free Software Foundation, Inc., 59 Temple Place - "
-"Suite 330, Boston, MA 02111-1307, USA."
+"GIMP.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
-"GIMP �ือ�อ����วร��สรี �ุ�สามาร��ำ��ำ��ื�อ�����าย �ละ/"
-"หรือ������ั���ล�ภาย�����ื�อ����อ���อ��ล��ารอ�ุ�า����สิ��ิ���� GNU General Public License "
-"�ึ���ี�ิม����ย Free Software Foundation ��วย�ั��รุ�� 2 �อ�สั��าอ�ุ�า� หรือ "
-"(�ล�ว����ุ��ะ�ลือ�) รุ��อื��� �ี�ออ�หลั��า��ี�\n"
+"GIMP �����อ����วร��สรี �ุ�สามาร������าย��อ �ละ/หรือ �������ร��รม��� ภาย�����ื�อ����อ� "
+"GNU General Public License �ี���ย��ร���ยมูล�ิ�ิ�อ����วร��สรี �ม�ว�า�ะ����สั��าอ�ุ�า�รุ���ี� 3 "
+"หรือรุ���ั�มา (�าม����ุ��ะ�ลือ�)\n"
 "\n"
-"GIMP �ู���ย��ร���วย�วามหวั�ว�า�ะมี�ระ�ย��� ����ม�มี�ารรั��ระ�ั���� �ั��สิ�� "
-"�ม��ระ�ั���ารรั��ระ�ั���ย�ัยยะ�ึ����ิ��า��าร�ื�อ�าย หรือ�าร�ำ�����าะ�������ร�ี�ิ�ศษ "
-"�รุ�า�ูรายละ�อีย���ิ�ม��ิม�ี� GNU General Public License\n"
+"GIMP ��ย��ร���วย�วามหวั�ว�า��ร��รม�ะมี�ระ�ย��� ��� *�ม�มี�ารรั��ระ�ั����* "
+"�ม�มี�ม��ารรั��ระ�ั� *อรร��ระ�ย�����ิ��า�ิ�ย�* หรือ "
+"*�วาม�หมาะสมสำหรั�วั��ุ�ระส������าะ�ิ����* �รุ�าอ�า� GNU General Public License "
+"��ื�อ�ูรายละ�อีย���ิ�ม��ิม\n"
 "\n"
-"�ุ��วร�ะ���รั�สำ��า�อ� GNU General Public License มา�ร�อม�ั� GIMP; ��า�ม�มี "
-"�ห���ีย���หมาย�������ี� Free Software Foundation, Inc., 59 Temple Place - Suite "
-"330, Boston, MA 02111-1307, USA."
+"�ุ��วร�ะ���รั�สำ��า�อ� GNU General Public License มา�ร�อม�ั� GIMP ��า�ุ��ม����รั� "
+"�รุ�า�ู����ี� <http://www.gnu.org/licenses/>"
 
-#: ../app/app_procs.c:138
-msgid "(This console window will close in ten seconds)\n"
-msgstr "(ห��า��า��อ���ล�ี��ะ�ิ�ภาย��สิ�วิ�า�ี)\n"
-
-#: ../app/app_procs.c:248
+#: ../app/app.c:219
 #, c-format
 msgid ""
 "Unable to open a test swap file.\n"
@@ -80,110 +75,115 @@ msgstr ""
 "�ม�สามาร���ิ����มสลั���ื�อ��สอ����\n"
 "\n"
 "��ื�อ��อ��ั���อมูลสู�หาย �รุ�า�รว�สอ��ำ�ห����ละสิ��ิอ�ุ�า��อ����ร��อรีสำหรั�สลั� "
-"�ี��ู��ำห���ว�����า�รั������อ��ุ� (�ั��ุ�ั��ือ \"%s\")."
-
-#: ../app/app_procs.c:306 ../app/core/gimppalette-import.c:564
-#, c-format
-msgid "Opening '%s' failed: %s"
-msgstr "�าร��ิ� '%s' ล�ม�หลว: %s"
+"�ี��ำห���ว�����า�รั������อ��ุ� (�ั��ุ�ั��ือ \"%s\")."
 
-#: ../app/batch.c:74
+#: ../app/batch.c:75
 #, c-format
 msgid "No batch interpreter specified, using the default '%s'.\n"
 msgstr "�ม�����ำห���ัว��ล�ุ��ำสั���ว� ����ัว�ริยาย�ือ '%s'\n"
 
-#: ../app/batch.c:92 ../app/batch.c:110
+#: ../app/batch.c:93 ../app/batch.c:111
 #, c-format
 msgid "The batch interpreter '%s' is not available. Batch mode disabled."
 msgstr "�ัว��ล�ุ��ำสั�� '%s' ����า��ม���� �ิ��าร����า��หม��ุ��ำสั��"
 
-#: ../app/main.c:125 ../tools/gimp-remote.c:79
+#: ../app/main.c:135 ../tools/gimp-remote.c:59
 msgid "Show version information and exit"
 msgstr "�ส����อมูลรุ���ล�วออ��า���ร��รม"
 
-#: ../app/main.c:130
+#: ../app/main.c:140
 msgid "Show license information and exit"
 msgstr "�ส����อมูล��อ��ล��ารอ�ุ�า����สิ��ิ��ล�วออ��า���ร��รม"
 
-#: ../app/main.c:135
+#: ../app/main.c:145
 msgid "Be more verbose"
 msgstr "�ส��รายละ�อีย�มา��ึ��"
 
-#: ../app/main.c:140
+#: ../app/main.c:150
+msgid "Start a new GIMP instance"
+msgstr ""
+
+#: ../app/main.c:155
+#, fuzzy
+#| msgid "Open Image as Layer"
+msgid "Open images as new"
+msgstr "��ิ�ภา����า�����ั���า�"
+
+#: ../app/main.c:160
 msgid "Run without a user interface"
 msgstr "�ำ�า���ย�ม���อ�มีส�ว��ิ���อ�ู����"
 
-#: ../app/main.c:145
+#: ../app/main.c:165
 msgid "Do not load brushes, gradients, patterns, ..."
 msgstr "�ม���อ��หล�หัว��ร�, สี�ร��า, ���ลาย, ..."
 
-#: ../app/main.c:150
+#: ../app/main.c:170
 msgid "Do not load any fonts"
 msgstr "�ม���อ��หล����อั�ษร���"
 
-#: ../app/main.c:155
+#: ../app/main.c:175
 msgid "Do not show a startup window"
 msgstr "�ม���อ��ส��ห��า��า��ริ�ม�าร�ำ�า�"
 
-#: ../app/main.c:160
+#: ../app/main.c:180
 msgid "Do not use shared memory between GIMP and plugins"
 msgstr "�ม�����วาม�ำร�วม�ั�ระหว�า� GIMP �ละ ��ร��รม�สริม��า� �"
 
-#: ../app/main.c:165
+#: ../app/main.c:185
 msgid "Do not use special CPU acceleration functions"
 msgstr "�ม�����ั����ั��าร�ร���วาม�ร�ว�ิ�ศษ��วยห��วย�ระมวล�ล"
 
-#: ../app/main.c:170
+#: ../app/main.c:190
 msgid "Use an alternate sessionrc file"
 msgstr "�ลือ�������ม sessionrc อื��"
 
-#: ../app/main.c:175
+#: ../app/main.c:195
 msgid "Use an alternate user gimprc file"
 msgstr "�ลือ�������ม gimprc สำหรั��ู����"
 
-#: ../app/main.c:180
+#: ../app/main.c:200
 msgid "Use an alternate system gimprc file"
 msgstr "�ลือ�������ม gimprc สำหรั�ระ��"
 
-#: ../app/main.c:185
+#: ../app/main.c:205
 msgid "Batch command to run (can be used multiple times)"
 msgstr "�ุ��ำสั���ี��ะรั� (สามาร�������หลาย� �รั��)"
 
-#: ../app/main.c:190
+#: ../app/main.c:210
 msgid "The procedure to process batch commands with"
 msgstr "��ร�ี�ยอร��ี��ะ�ระมวล�ล�ำสั����วย"
 
-#: ../app/main.c:195
+#: ../app/main.c:215
 msgid "Send messages to console instead of using a dialog"
 msgstr "ส����อ�วาม��ยั��อ���ล����ี��าร����ล�อ�����อ�"
 
 #. don't translate the mode names (off|on|warn)
-#: ../app/main.c:201
+#: ../app/main.c:221
 msgid "PDB compatibility mode (off|on|warn)"
 msgstr "�หม��วาม���า�ั�����ั� PDB (off|on|warn)"
 
 #. don't translate the mode names (never|query|always)
-#: ../app/main.c:207
+#: ../app/main.c:227
 msgid "Debug in case of a crash (never|query|always)"
 msgstr "���า�หม��ี�ั����ร�ี�ี���ร��รม�ั���อ� (never|query|always)"
 
-#: ../app/main.c:212
+#: ../app/main.c:232
 msgid "Enable non-fatal debugging signal handlers"
 msgstr "Enable non-fatal debugging signal handlers"
 
-#: ../app/main.c:217
+#: ../app/main.c:237
 msgid "Make all warnings fatal"
 msgstr "มอ��ุ���อ�ิ��ลา�ระ�ั��ำ��ือ� ������อ�ิ��ลา�ร�าย�ร�"
 
-#: ../app/main.c:222
+#: ../app/main.c:242
 msgid "Output a gimprc file with default settings"
 msgstr "สร�า����ม gimprc ��วย��า�ั���ริยาย"
 
-#: ../app/main.c:287
+#: ../app/main.c:346
 msgid "[FILE|URI...]"
 msgstr "[FILE|URI...]"
 
-#: ../app/main.c:302
+#: ../app/main.c:364
 msgid ""
 "GIMP could not initialize the graphical user interface.\n"
 "Make sure a proper setup for your display environment exists."
@@ -191,12 +191,24 @@ msgstr ""
 "GIMP �ม�สามาร��ริ�ม�าร�ส���ลส�ว��ิ���อ�ู��������รา�ิ����\n"
 "�รุ�า�รว�สอ��ห������ว�า����ั����า�ว�ล�อม��ี�ยว�ั��าร�ส���ล�ี��หมาะสม�ล�ว"
 
-#: ../app/main.c:452 ../tools/gimp-remote.c:321
+#: ../app/main.c:383
+msgid "Another GIMP instance is already running."
+msgstr ""
+
+#: ../app/main.c:453
+msgid "GIMP output. Type any character to close this window."
+msgstr ""
+
+#: ../app/main.c:454
 #, c-format
-msgid "%s version %s"
-msgstr "%s รุ�� %s"
+msgid "(Type any character to close this window)\n"
+msgstr ""
 
-#: ../app/sanity.c:192
+#: ../app/main.c:471
+msgid "GIMP output. You can minimize this window, but don't close it."
+msgstr ""
+
+#: ../app/sanity.c:363
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
@@ -207,7 +219,7 @@ msgstr ""
 "\n"
 "�รุ�า�รว�สอ���า�อ��ัว��ร�ว�ล�อม G_FILENAME_ENCODING"
 
-#: ../app/sanity.c:211
+#: ../app/sanity.c:382
 #, c-format
 msgid ""
 "The name of the directory holding the GIMP user configuration cannot be "
@@ -222,405 +234,542 @@ msgstr ""
 "ระ�����ม�อ��ุ�มั��ะ�ู����ารหัส�ี�����อย�า�อื���ี��ม���� UTF-8 �ละ�ุ��ม�����อ� GLib ว�า�ืออะ�ร "
 "�รุ�า�ั����า�ัว��ร�ว�ล�อม G_FILENAME_ENCODING"
 
-#: ../app/actions/actions.c:98 ../app/dialogs/dialogs.c:215
-#: ../app/widgets/gimpbrusheditor.c:90
+#. show versions of libraries used by GIMP
+#: ../app/version.c:63
+#, c-format
+msgid "using %s version %s (compiled against version %s)"
+msgstr ""
+
+#: ../app/version.c:126 ../tools/gimp-remote.c:94
+#, c-format
+msgid "%s version %s"
+msgstr "%s รุ�� %s"
+
+#: ../app/actions/actions.c:109 ../app/dialogs/dialogs.c:353
+#: ../app/widgets/gimpbrusheditor.c:89
 msgid "Brush Editor"
-msgstr "�ัว�����หัว��ร�"
+msgstr "��รื�อ�มือ�����หัว��ร�"
 
 #. initialize the list of gimp brushes
-#: ../app/actions/actions.c:101 ../app/actions/dialogs-actions.c:130
-#: ../app/core/gimp.c:815 ../app/dialogs/dialogs.c:148
-#: ../app/dialogs/preferences-dialog.c:2568
+#: ../app/actions/actions.c:112 ../app/core/gimp.c:951
+#: ../app/dialogs/dialogs.c:282 ../app/dialogs/preferences-dialog.c:2720
 msgid "Brushes"
 msgstr "หัว��ร�"
 
-#: ../app/actions/actions.c:104 ../app/actions/dialogs-actions.c:155
-#: ../app/dialogs/dialogs.c:160
+#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:292
 msgid "Buffers"
 msgstr "�ุ��ั���อมูล"
 
-#: ../app/actions/actions.c:107 ../app/actions/dialogs-actions.c:80
-#: ../app/dialogs/dialogs.c:173
+#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:311
 msgid "Channels"
 msgstr "�����ล"
 
-#: ../app/actions/actions.c:110
-msgid "Colormap Editor"
-msgstr "�ัว������ั�สี"
+#: ../app/actions/actions.c:121 ../app/dialogs/convert-dialog.c:174
+#: ../app/dialogs/dialogs.c:319
+msgid "Colormap"
+msgstr "�ั�สี"
+
+#: ../app/actions/actions.c:124
+#, fuzzy
+#| msgid "Resource configuration"
+msgid "Configuration"
+msgstr "�าร�ำห����า�หล����อมูล"
 
-#: ../app/actions/actions.c:113
+#: ../app/actions/actions.c:127
 msgid "Context"
 msgstr "�ริ��"
 
-#: ../app/actions/actions.c:116 ../app/actions/dialogs-actions.c:115
-#: ../app/dialogs/dialogs.c:141
+#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:275
 msgid "Pointer Information"
 msgstr "��อมูล�ัว�ี�"
 
-#: ../app/actions/actions.c:119
+#: ../app/actions/actions.c:133
 msgid "Debug"
 msgstr "�ี�ั�"
 
-#: ../app/actions/actions.c:122
+#: ../app/actions/actions.c:136
 msgid "Dialogs"
 msgstr "�ล�อ�����อ�"
 
-#: ../app/actions/actions.c:125
+#: ../app/actions/actions.c:139
 msgid "Dock"
 msgstr "สำรั��า�"
 
-#: ../app/actions/actions.c:128
+#: ../app/actions/actions.c:142
 msgid "Dockable"
 msgstr "�ั��ส�สำรั��า����"
 
 #. Document History
-#: ../app/actions/actions.c:131 ../app/actions/dialogs-actions.c:165
-#: ../app/dialogs/dialogs.c:162 ../app/dialogs/preferences-dialog.c:1508
+#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:294
+#: ../app/dialogs/preferences-dialog.c:1573
 msgid "Document History"
 msgstr "�ระวั�ิ�อ�สาร"
 
-#: ../app/actions/actions.c:134
+#: ../app/actions/actions.c:148
 msgid "Drawable"
 msgstr "สามาร�วา����"
 
-#: ../app/actions/actions.c:137 ../app/tools/tools-enums.c:180
+#. Some things do not have grids, so just list
+#: ../app/actions/actions.c:151 ../app/dialogs/dialogs.c:300
+msgid "Paint Dynamics"
+msgstr ""
+
+#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:357
+#: ../app/widgets/gimpdynamicseditor.c:94
+#, fuzzy
+#| msgid "Gradient Editor"
+msgid "Paint Dynamics Editor"
+msgstr "��รื�อ�มือ�����สี�ร��า"
+
+#: ../app/actions/actions.c:157
 msgid "Edit"
 msgstr "�����"
 
-#: ../app/actions/actions.c:140 ../app/actions/dialogs-actions.c:180
-#: ../app/dialogs/dialogs.c:137
+#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:271
 msgid "Error Console"
 msgstr "ห��า��า��ส����อ�ิ��ลา�"
 
-#: ../app/actions/actions.c:143
+#: ../app/actions/actions.c:163
 msgid "File"
 msgstr "���ม"
 
-#. initialize the list of gimp fonts
-#: ../app/actions/actions.c:146 ../app/actions/dialogs-actions.c:150
-#: ../app/core/gimp.c:831 ../app/dialogs/dialogs.c:156
-#: ../app/dialogs/preferences-dialog.c:2584
+#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:290
+#: ../app/dialogs/preferences-dialog.c:2740
 msgid "Fonts"
 msgstr "���อั�ษร"
 
-#: ../app/actions/actions.c:149 ../app/dialogs/dialogs.c:219
-#: ../app/widgets/gimpgradienteditor.c:276
+#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:361
+#: ../app/widgets/gimpgradienteditor.c:275
 msgid "Gradient Editor"
-msgstr "�ัว�����สี�ร��า"
+msgstr "��รื�อ�มือ�����สี�ร��า"
 
 #. initialize the list of gimp gradients
-#: ../app/actions/actions.c:152 ../app/actions/dialogs-actions.c:140
-#: ../app/core/gimp.c:827 ../app/dialogs/dialogs.c:152
-#: ../app/dialogs/preferences-dialog.c:2580
+#: ../app/actions/actions.c:172 ../app/core/gimp.c:971
+#: ../app/dialogs/dialogs.c:286 ../app/dialogs/preferences-dialog.c:2736
 msgid "Gradients"
 msgstr "สี�ร��า"
 
-#: ../app/actions/actions.c:155
+#. initialize the list of gimp tool presets
+#: ../app/actions/actions.c:175 ../app/core/gimp.c:981
+#: ../app/dialogs/dialogs.c:302
+msgid "Tool Presets"
+msgstr ""
+
+#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:369
+#: ../app/widgets/gimptoolpreseteditor.c:75
+#, fuzzy
+#| msgid "Text Editor"
+msgid "Tool Preset Editor"
+msgstr "��รื�อ�มือ�������อ�วาม"
+
+#: ../app/actions/actions.c:181
 msgid "Help"
 msgstr "��วย�หลือ"
 
-#: ../app/actions/actions.c:158 ../app/core/core-enums.c:212
-#: ../app/tools/tools-enums.c:212
+#: ../app/actions/actions.c:184
 msgid "Image"
 msgstr "ภา�"
 
 #. list & grid views
-#: ../app/actions/actions.c:161 ../app/actions/dialogs-actions.c:160
-#: ../app/dialogs/dialogs.c:146
+#: ../app/actions/actions.c:187 ../app/dialogs/dialogs.c:280
 msgid "Images"
 msgstr "ภา�"
 
-#: ../app/actions/actions.c:164 ../app/actions/dialogs-actions.c:75
-#: ../app/dialogs/dialogs.c:169 ../app/dialogs/resize-dialog.c:285
+#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:307
+#: ../app/dialogs/resize-dialog.c:287
 msgid "Layers"
 msgstr "�ั���า�"
 
-#: ../app/actions/actions.c:167 ../app/dialogs/dialogs.c:223
-#: ../app/widgets/gimppaletteeditor.c:156
+#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:365
+#: ../app/widgets/gimppaletteeditor.c:154
 msgid "Palette Editor"
-msgstr "�ัว������า�สี"
+msgstr "��รื�อ�มือ������า�สี"
 
 #. initialize the list of gimp palettes
-#: ../app/actions/actions.c:170 ../app/actions/dialogs-actions.c:145
-#: ../app/core/gimp.c:823 ../app/dialogs/dialogs.c:154
-#: ../app/dialogs/preferences-dialog.c:2576
+#: ../app/actions/actions.c:196 ../app/core/gimp.c:966
+#: ../app/dialogs/dialogs.c:288 ../app/dialogs/preferences-dialog.c:2732
 msgid "Palettes"
 msgstr "�า�สี"
 
 #. initialize the list of gimp patterns
-#: ../app/actions/actions.c:173 ../app/actions/dialogs-actions.c:135
-#: ../app/core/gimp.c:819 ../app/dialogs/dialogs.c:150
-#: ../app/dialogs/preferences-dialog.c:2572
+#: ../app/actions/actions.c:199 ../app/core/gimp.c:961
+#: ../app/dialogs/dialogs.c:284 ../app/dialogs/preferences-dialog.c:2728
 msgid "Patterns"
 msgstr "���ลาย"
 
-#: ../app/actions/actions.c:176 ../app/dialogs/preferences-dialog.c:2588
+#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2744
 msgid "Plug-Ins"
 msgstr "��ร��รม�สริม"
 
-#: ../app/actions/actions.c:179 ../app/core/core-enums.c:857
-#: ../app/core/gimpchannel.c:361
+#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:369
 msgid "Quick Mask"
 msgstr "ห��า�า�ภา���ว�"
 
-#: ../app/actions/actions.c:182 ../app/actions/dialogs-actions.c:120
-#: ../app/dialogs/dialogs.c:197
+#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:335
 msgid "Sample Points"
 msgstr "�ุ��ัวอย�า�"
 
-#: ../app/actions/actions.c:185
+#: ../app/actions/actions.c:211
 msgid "Select"
 msgstr "�ลือ�"
 
 #. initialize the template list
-#: ../app/actions/actions.c:188 ../app/core/gimp.c:840
-#: ../app/dialogs/dialogs.c:164
+#: ../app/actions/actions.c:214 ../app/core/gimp.c:986
+#: ../app/dialogs/dialogs.c:296
 msgid "Templates"
 msgstr "�ม����"
 
-#: ../app/actions/actions.c:191
+#: ../app/actions/actions.c:217
+msgid "Text Tool"
+msgstr "��รื�อ�มือ��อ�วาม"
+
+#: ../app/actions/actions.c:220
 msgid "Text Editor"
-msgstr "�ัว�������อ�วาม"
+msgstr "��รื�อ�มือ�������อ�วาม"
 
-#: ../app/actions/actions.c:194 ../app/actions/dialogs-actions.c:65
-#: ../app/dialogs/dialogs.c:129 ../app/dialogs/preferences-dialog.c:1751
-#: ../app/gui/gui.c:424
+#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:263
+#: ../app/dialogs/preferences-dialog.c:1854 ../app/gui/gui.c:430
 msgid "Tool Options"
 msgstr "�ัว�ลือ��อ���รื�อ�มือ"
 
-#: ../app/actions/actions.c:197 ../app/actions/dialogs-actions.c:175
-#: ../app/dialogs/dialogs.c:158
+#: ../app/actions/actions.c:226 ../app/widgets/gimptoolbox.c:934
 msgid "Tools"
 msgstr "��รื�อ�มือ"
 
-#: ../app/actions/actions.c:200 ../app/actions/dialogs-actions.c:85
-#: ../app/dialogs/dialogs.c:177 ../app/tools/gimpvectortool.c:158
+#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:315
+#: ../app/tools/gimpvectortool.c:162
 msgid "Paths"
 msgstr "�ส���า�"
 
-#: ../app/actions/actions.c:203
+#: ../app/actions/actions.c:232
 msgid "View"
 msgstr "�ส��"
 
+#: ../app/actions/actions.c:235
+msgid "Windows"
+msgstr "ห��า��า�"
+
+#. value description and new value shown in the status bar
+#: ../app/actions/actions.c:583
+#, c-format
+msgid "%s: %.2f"
+msgstr ""
+
+#. value description and new value shown in the status bar
+#: ../app/actions/actions.c:609
+#, c-format
+msgid "%s: %d"
+msgstr ""
+
 #: ../app/actions/brush-editor-actions.c:42
+msgctxt "brush-editor-action"
 msgid "Brush Editor Menu"
-msgstr "�ม�ู�ัว�����หัว��ร�"
+msgstr "�ม�ู��รื�อ�มือ�����หัว��ร�"
 
 #: ../app/actions/brush-editor-actions.c:49
+msgctxt "brush-editor-action"
 msgid "Edit Active Brush"
-msgstr "�����หัว��ร��ี��ำ�า�อยู�"
+msgstr "�����หัว��ร��ี�����า�อยู�"
 
-#: ../app/actions/brushes-actions.c:43
+#: ../app/actions/brushes-actions.c:42
+msgctxt "brushes-action"
 msgid "Brushes Menu"
 msgstr "�ม�ูหัว��ร�"
 
-#: ../app/actions/brushes-actions.c:47
+#: ../app/actions/brushes-actions.c:46
+msgctxt "brushes-action"
 msgid "_Open Brush as Image"
-msgstr "�_�ิ�หัว��ร�����ภา�"
+msgstr "_��ิ�หัว��ร�����ภา�"
 
-#: ../app/actions/brushes-actions.c:48
+#: ../app/actions/brushes-actions.c:47
+msgctxt "brushes-action"
 msgid "Open brush as image"
 msgstr "��ิ�หัว��ร�����ภา�"
 
-#: ../app/actions/brushes-actions.c:53
+#: ../app/actions/brushes-actions.c:52
+msgctxt "brushes-action"
 msgid "_New Brush"
 msgstr "หัว��ร��_หม�"
 
-#: ../app/actions/brushes-actions.c:54
-msgid "New brush"
-msgstr "หัว��ร��หม�"
+#: ../app/actions/brushes-actions.c:53
+msgctxt "brushes-action"
+msgid "Create a new brush"
+msgstr "สร�า�หัว��ร��หม�"
 
-#: ../app/actions/brushes-actions.c:59
+#: ../app/actions/brushes-actions.c:58
+msgctxt "brushes-action"
 msgid "D_uplicate Brush"
 msgstr "สำ�_�าหัว��ร�"
 
-#: ../app/actions/brushes-actions.c:60
-msgid "Duplicate brush"
-msgstr "สำ��าหัว��ร�"
+#: ../app/actions/brushes-actions.c:59
+msgctxt "brushes-action"
+msgid "Duplicate this brush"
+msgstr "สำ��าหัว��ร��ี�"
 
-#: ../app/actions/brushes-actions.c:65
+#: ../app/actions/brushes-actions.c:64
+msgctxt "brushes-action"
 msgid "Copy Brush _Location"
 msgstr "�ั�ลอ��ำ�ห���_หัว��ร�"
 
-#: ../app/actions/brushes-actions.c:66
+#: ../app/actions/brushes-actions.c:65
+msgctxt "brushes-action"
 msgid "Copy brush file location to clipboard"
 msgstr "�ั�ลอ��ำ�ห������มหัว��ร����ี��ลิ��อร��"
 
-#: ../app/actions/brushes-actions.c:71
+#: ../app/actions/brushes-actions.c:70
+msgctxt "brushes-action"
 msgid "_Delete Brush"
 msgstr "_ล�หัว��ร�"
 
-#: ../app/actions/brushes-actions.c:72
-msgid "Delete brush"
-msgstr "ล�หัว��ร�"
+#: ../app/actions/brushes-actions.c:71
+msgctxt "brushes-action"
+msgid "Delete this brush"
+msgstr "ล�หัว��ร��ี�"
 
-#: ../app/actions/brushes-actions.c:77
+#: ../app/actions/brushes-actions.c:76
+msgctxt "brushes-action"
 msgid "_Refresh Brushes"
-msgstr "�_รีย�หัว��ร��หม�"
+msgstr "�_รีย�อ�า�หัว��ร��หม�"
 
-#: ../app/actions/brushes-actions.c:78
+#: ../app/actions/brushes-actions.c:77
+msgctxt "brushes-action"
 msgid "Refresh brushes"
-msgstr "�รีย�หัว��ร��หม�"
+msgstr "�รีย�อ�า�หัว��ร��หม�"
 
-#: ../app/actions/brushes-actions.c:86
+#: ../app/actions/brushes-actions.c:85
+msgctxt "brushes-action"
 msgid "_Edit Brush..."
-msgstr "����_�หัว��ร�..."
+msgstr "�_����หัว��ร�..."
 
-#: ../app/actions/brushes-actions.c:87
-msgid "Edit brush"
-msgstr "�����หัว��ร�"
+#: ../app/actions/brushes-actions.c:86
+msgctxt "brushes-action"
+msgid "Edit this brush"
+msgstr "�����หัว��ร��ี�"
 
-#: ../app/actions/buffers-actions.c:42
+#: ../app/actions/buffers-actions.c:41
+#, fuzzy
+#| msgid "Buffers Menu"
+msgctxt "buffers-action"
 msgid "Buffers Menu"
 msgstr "�ม�ู�ุ��ั���อมูล"
 
-#: ../app/actions/buffers-actions.c:46
+#: ../app/actions/buffers-actions.c:45
+msgctxt "buffers-action"
 msgid "_Paste Buffer"
 msgstr "�_�ะ�ุ��ั���อมูล"
 
-#: ../app/actions/buffers-actions.c:47
+#: ../app/actions/buffers-actions.c:46
+#, fuzzy
+#| msgid "Paste the selected buffer"
+msgctxt "buffers-action"
 msgid "Paste the selected buffer"
 msgstr "��ะ��อมูล�า��ุ��ั���อมูล�ี��ลือ��ว�"
 
-#: ../app/actions/buffers-actions.c:52
+#: ../app/actions/buffers-actions.c:51
+#, fuzzy
+#| msgid "Paste Buffer _Into"
+msgctxt "buffers-action"
 msgid "Paste Buffer _Into"
 msgstr "��ะ�ุ��ั���อมูลล_���"
 
-#: ../app/actions/buffers-actions.c:53
+#: ../app/actions/buffers-actions.c:52
+#, fuzzy
+#| msgid "Paste the selected buffer into the selection"
+msgctxt "buffers-action"
 msgid "Paste the selected buffer into the selection"
 msgstr "��ะ�หล���ุ��ั���อมูล�ี��ลือ��ว�ล����ื���ี��ี��ลือ�"
 
-#: ../app/actions/buffers-actions.c:58
+#: ../app/actions/buffers-actions.c:57
+#, fuzzy
+#| msgid "Paste Buffer as _New"
+msgctxt "buffers-action"
 msgid "Paste Buffer as _New"
 msgstr "��ะ�ุ��ั���อมูล����_อั��หม�"
 
-#: ../app/actions/buffers-actions.c:59
-msgid "Paste the selected buffer as new image"
+#: ../app/actions/buffers-actions.c:58
+#, fuzzy
+#| msgid "Paste the selected buffer as new image"
+msgctxt "buffers-action"
+msgid "Paste the selected buffer as a new image"
 msgstr "��ะ��อมูล�า��ุ��ั���อมูล�ี��ลือ��ว�����ภา��หม�"
 
-#: ../app/actions/buffers-actions.c:64
+#: ../app/actions/buffers-actions.c:63
+#, fuzzy
+#| msgid "_Delete Buffer"
+msgctxt "buffers-action"
 msgid "_Delete Buffer"
 msgstr "_ล��ุ��ั���อมูล"
 
-#: ../app/actions/buffers-actions.c:65
+#: ../app/actions/buffers-actions.c:64
+msgctxt "buffers-action"
 msgid "Delete the selected buffer"
 msgstr "ล��ุ��ั���อมูล�ี��ลือ��ว�"
 
 #: ../app/actions/channels-actions.c:44
+msgctxt "channels-action"
 msgid "Channels Menu"
 msgstr "�ม�ู�����ล"
 
 #: ../app/actions/channels-actions.c:48
+msgctxt "channels-action"
 msgid "_Edit Channel Attributes..."
-msgstr "����_��ุ�ลั�ษ�ะ�อ������ล..."
+msgstr "�_�����ุ�ลั�ษ�ะ�อ������ล..."
 
 #: ../app/actions/channels-actions.c:49
+msgctxt "channels-action"
 msgid "Edit the channel's name, color and opacity"
-msgstr "������ื�อ�����ล, สี�ละ�วาม�ึ�"
+msgstr "������ื�อ, สี �ละ�วาม�ึ��อ������ล"
 
 #: ../app/actions/channels-actions.c:54
+msgctxt "channels-action"
 msgid "_New Channel..."
 msgstr "�����ล�_หม�..."
 
 #: ../app/actions/channels-actions.c:55
+msgctxt "channels-action"
 msgid "Create a new channel"
 msgstr "สร�า������ล�หม�"
 
 #: ../app/actions/channels-actions.c:60
+msgctxt "channels-action"
 msgid "_New Channel"
-msgstr "สร�า������ล�_หม�"
+msgstr "�����ล�_หม�"
 
 #: ../app/actions/channels-actions.c:61
+msgctxt "channels-action"
 msgid "Create a new channel with last used values"
 msgstr "��ิ������ล�หม���วย��า�ี����ล�าสุ�"
 
 #: ../app/actions/channels-actions.c:66
+msgctxt "channels-action"
 msgid "D_uplicate Channel"
 msgstr "สำ�_�า�����ล"
 
-#: ../app/actions/channels-actions.c:67
+#: ../app/actions/channels-actions.c:68
+msgctxt "channels-action"
 msgid "Create a duplicate of this channel and add it to the image"
 msgstr "สร�า��ุ�สำ��า�อ������ล�ี��ละ��ิ�มล�����ภา�"
 
-#: ../app/actions/channels-actions.c:72
+#: ../app/actions/channels-actions.c:73
+msgctxt "channels-action"
 msgid "_Delete Channel"
 msgstr "_ล������ล"
 
-#: ../app/actions/channels-actions.c:73
+#: ../app/actions/channels-actions.c:74
+msgctxt "channels-action"
 msgid "Delete this channel"
-msgstr "ล������ล"
+msgstr "ล������ล�ี�"
 
-#: ../app/actions/channels-actions.c:78
+#: ../app/actions/channels-actions.c:79
+#, fuzzy
+#| msgid "_Raise Channel"
+msgctxt "channels-action"
 msgid "_Raise Channel"
 msgstr "_�ลื�อ�ลำ�ั������ล�ึ��"
 
-#: ../app/actions/channels-actions.c:79
+#: ../app/actions/channels-actions.c:80
+#, fuzzy
+#| msgid "Raise this channel one step in the channel stack"
+msgctxt "channels-action"
 msgid "Raise this channel one step in the channel stack"
 msgstr "�ลื�อ�ลำ�ั������ล�ี��ึ��ห�ึ���ั����ลำ�ั��ั���อ������ล"
 
-#: ../app/actions/channels-actions.c:84
+#: ../app/actions/channels-actions.c:85
+#, fuzzy
+#| msgid "Raise Channel to _Top"
+msgctxt "channels-action"
 msgid "Raise Channel to _Top"
 msgstr "�ลื�อ�ลำ�ั������ล�ึ����ระ�ั�_��สุ�"
 
-#: ../app/actions/channels-actions.c:85
+#: ../app/actions/channels-actions.c:87
+#, fuzzy
+#| msgid "Raise this channel to the top of the channel stack"
+msgctxt "channels-action"
 msgid "Raise this channel to the top of the channel stack"
 msgstr "�ลื�อ�ลำ�ั������ล�ี��ึ�����ว���สุ��อ�ลำ�ั��ั���อ������ล"
 
-#: ../app/actions/channels-actions.c:90
+#: ../app/actions/channels-actions.c:92
+#, fuzzy
+#| msgid "_Lower Channel"
+msgctxt "channels-action"
 msgid "_Lower Channel"
 msgstr "�ลื�อ�ลำ�ั������ล_ล�"
 
-#: ../app/actions/channels-actions.c:91
+#: ../app/actions/channels-actions.c:93
+#, fuzzy
+#| msgid "Lower this channel one step in the channel stack"
+msgctxt "channels-action"
 msgid "Lower this channel one step in the channel stack"
 msgstr "�ลื�อ�ลำ�ั������ล�ี�ล�ห�ึ���ั����ลำ�ั��ั���อ������ล"
 
-#: ../app/actions/channels-actions.c:96
+#: ../app/actions/channels-actions.c:98
+#, fuzzy
+#| msgid "Lower Channel to _Bottom"
+msgctxt "channels-action"
 msgid "Lower Channel to _Bottom"
 msgstr "�ลื�อ�ลำ�ั������ลล����ว�_ล�า�สุ�"
 
-#: ../app/actions/channels-actions.c:97
+#: ../app/actions/channels-actions.c:100
+#, fuzzy
+#| msgid "Lower this channel to the bottom of the channel stack"
+msgctxt "channels-action"
 msgid "Lower this channel to the bottom of the channel stack"
 msgstr "�ลื�อ�ลำ�ั������ลล�ล�า�สุ��อ�ลำ�ั��ั���อ������ล"
 
-#: ../app/actions/channels-actions.c:105
+#: ../app/actions/channels-actions.c:108
+#, fuzzy
+#| msgid "Channel to Sele_ction"
+msgctxt "channels-action"
 msgid "Channel to Sele_ction"
 msgstr "��ล������ล����_�ื���ี��ลือ�"
 
-#: ../app/actions/channels-actions.c:106
+#: ../app/actions/channels-actions.c:109
+#, fuzzy
+#| msgid "Replace the selection with this channel"
+msgctxt "channels-action"
 msgid "Replace the selection with this channel"
 msgstr "����ี��ื���ี��ลือ��ั��ุ�ั���วย�����ล�ี�"
 
-#: ../app/actions/channels-actions.c:111 ../app/actions/layers-actions.c:260
-#: ../app/actions/vectors-actions.c:173
+#: ../app/actions/channels-actions.c:114
+msgctxt "channels-action"
 msgid "_Add to Selection"
 msgstr "�_�ิ�ม���า�����ื���ี��ลือ�"
 
-#: ../app/actions/channels-actions.c:112
+#: ../app/actions/channels-actions.c:115
+msgctxt "channels-action"
 msgid "Add this channel to the current selection"
 msgstr "รวม�����ล�ี����า�ั��ี���ี��ลือ��ั��ุ�ั�"
 
-#: ../app/actions/channels-actions.c:117 ../app/actions/layers-actions.c:266
-#: ../app/actions/layers-actions.c:293 ../app/actions/layers-actions.c:320
-#: ../app/actions/vectors-actions.c:179
+#: ../app/actions/channels-actions.c:120
+#, fuzzy
+#| msgid "_Subtract from Selection"
+msgctxt "channels-action"
 msgid "_Subtract from Selection"
 msgstr "_ล�ออ��า��ื���ี��ลือ�"
 
-#: ../app/actions/channels-actions.c:118
+#: ../app/actions/channels-actions.c:121
+#, fuzzy
+#| msgid "Subtract this channel from the current selection"
+msgctxt "channels-action"
 msgid "Subtract this channel from the current selection"
 msgstr "ล������ล�ี�ออ��า��ี���ี��ลือ��ั��ุ�ั�"
 
-#: ../app/actions/channels-actions.c:123 ../app/actions/layers-actions.c:272
-#: ../app/actions/layers-actions.c:299 ../app/actions/layers-actions.c:326
-#: ../app/actions/vectors-actions.c:185
+#: ../app/actions/channels-actions.c:126
+#, fuzzy
+#| msgid "_Intersect with Selection"
+msgctxt "channels-action"
 msgid "_Intersect with Selection"
 msgstr "หาส�ว��ั�_��อ��ั��ื���ี��ลือ�"
 
-#: ../app/actions/channels-actions.c:124
+#: ../app/actions/channels-actions.c:127
+#, fuzzy
+#| msgid "Intersect this channel with the current selection"
+msgctxt "channels-action"
 msgid "Intersect this channel with the current selection"
 msgstr "หาส�ว��ี��ั���อ�ระหว�า������ล�ี��ั��าร�ลือ��ั��ุ�ั�"
 
 #: ../app/actions/channels-commands.c:85
-#: ../app/actions/channels-commands.c:395
+#: ../app/actions/channels-commands.c:404
 msgid "Channel Attributes"
 msgstr "�ุ�ลั�ษ�ะ�อ������ล"
 
@@ -637,11 +786,14 @@ msgstr "�����สี�อ������ล"
 msgid "_Fill opacity:"
 msgstr "�_�ิม��า�วาม�ึ��ส�:"
 
-#: ../app/actions/channels-commands.c:116
+#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:263
+#: ../app/widgets/gimpchanneltreeview.c:345
+msgid "Channel"
+msgstr "�����ล"
+
 #: ../app/actions/channels-commands.c:117
 #: ../app/actions/channels-commands.c:159
-#: ../app/actions/channels-commands.c:163
-#: ../app/widgets/gimpchanneltreeview.c:314
+#: ../app/widgets/gimpchanneltreeview.c:340
 msgid "New Channel"
 msgstr "�����ล�หม�"
 
@@ -654,164 +806,222 @@ msgid "New Channel Color"
 msgstr "สี�อ������ล�หม�"
 
 # unsure
-#: ../app/actions/channels-commands.c:243
-#: ../app/display/gimpdisplayshell-dnd.c:500
-#: ../app/widgets/gimpchanneltreeview.c:247
-#: ../app/widgets/gimplayertreeview.c:805 ../app/widgets/gimptoolbox-dnd.c:309
+#: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:180
+#: ../app/display/gimpdisplayshell-dnd.c:599
+#: ../app/widgets/gimpchanneltreeview.c:272
+#: ../app/widgets/gimplayertreeview.c:802
 #, c-format
 msgid "%s Channel Copy"
 msgstr "สำ��า�����ล %s"
 
-#: ../app/actions/channels-commands.c:308 ../app/core/gimpselection.c:554
-#: ../app/pdb/selection_cmds.c:421 ../app/pdb/selection_cmds.c:484
+#: ../app/actions/channels-commands.c:315 ../app/core/gimpselection.c:583
+#: ../app/pdb/selection-cmds.c:454 ../app/pdb/selection-cmds.c:521
 msgid "Channel to Selection"
 msgstr "��ล������ล�����ื���ี��ลือ�"
 
-#: ../app/actions/colormap-editor-actions.c:43
+#: ../app/actions/colormap-actions.c:44
+msgctxt "colormap-action"
 msgid "Colormap Menu"
 msgstr "�ม�ู�ั�สี"
 
-#: ../app/actions/colormap-editor-actions.c:47
-#: ../app/actions/palette-editor-actions.c:48
+#: ../app/actions/colormap-actions.c:48
+msgctxt "colormap-action"
 msgid "_Edit Color..."
-msgstr "����_�สี..."
+msgstr "�_����สี..."
 
-#: ../app/actions/colormap-editor-actions.c:48
-#: ../app/actions/palette-editor-actions.c:49
-msgid "Edit color"
-msgstr "�����สี"
+#: ../app/actions/colormap-actions.c:49
+msgctxt "colormap-action"
+msgid "Edit this color"
+msgstr "�����สี�ี�"
 
-#: ../app/actions/colormap-editor-actions.c:56
+#: ../app/actions/colormap-actions.c:57
+msgctxt "colormap-action"
 msgid "_Add Color from FG"
 msgstr "�_�ิ�มสี�า�สี�ื��ห��า"
 
-#: ../app/actions/colormap-editor-actions.c:57
+#: ../app/actions/colormap-actions.c:58
+msgctxt "colormap-action"
 msgid "Add current foreground color"
 msgstr "��ิ�มสี��วยสี�ื��ห��า�ั��ุ�ั�"
 
-#: ../app/actions/colormap-editor-actions.c:62
+#: ../app/actions/colormap-actions.c:63
+msgctxt "colormap-action"
 msgid "_Add Color from BG"
 msgstr "��ิ�มสี_�า�สี�ื��หลั�"
 
-#: ../app/actions/colormap-editor-actions.c:63
+#: ../app/actions/colormap-actions.c:64
+msgctxt "colormap-action"
 msgid "Add current background color"
 msgstr "��ิ�มสี��วยสี�ื��หลั��ั��ุ�ั�"
 
-#: ../app/actions/colormap-editor-commands.c:70
+#: ../app/actions/colormap-commands.c:73
 #, c-format
 msgid "Edit colormap entry #%d"
 msgstr "�����ราย�าร�ั�สีลำ�ั��ี� #%d"
 
-#: ../app/actions/colormap-editor-commands.c:77
+#: ../app/actions/colormap-commands.c:80
 msgid "Edit Colormap Entry"
 msgstr "�����ราย�าร�ั�สี"
 
+#: ../app/actions/config-actions.c:38
+msgctxt "config-action"
+msgid "Use _GEGL"
+msgstr ""
+
+#: ../app/actions/config-actions.c:39
+msgctxt "config-action"
+msgid "If possible, use GEGL for image processing"
+msgstr ""
+
 #: ../app/actions/context-actions.c:46
+msgctxt "context-action"
 msgid "_Context"
 msgstr "�_ริ��"
 
-#: ../app/actions/context-actions.c:47 ../app/actions/image-actions.c:65
+#: ../app/actions/context-actions.c:48
+msgctxt "context-action"
 msgid "_Colors"
 msgstr "_สี"
 
-#: ../app/actions/context-actions.c:48 ../app/actions/layers-actions.c:58
+#: ../app/actions/context-actions.c:50
+msgctxt "context-action"
 msgid "_Opacity"
 msgstr "�วาม_�ึ��ส�"
 
-#: ../app/actions/context-actions.c:49
+#: ../app/actions/context-actions.c:52
+msgctxt "context-action"
 msgid "Paint _Mode"
 msgstr "�หม��าร_�าสี"
 
-#: ../app/actions/context-actions.c:50
+#: ../app/actions/context-actions.c:54
+msgctxt "context-action"
 msgid "_Tool"
 msgstr "�_�รื�อ�มือ"
 
-#: ../app/actions/context-actions.c:51
-#: ../app/dialogs/preferences-dialog.c:1811
+#: ../app/actions/context-actions.c:56
+msgctxt "context-action"
 msgid "_Brush"
 msgstr "_หัว��ร�"
 
-#: ../app/actions/context-actions.c:52 ../app/actions/plug-in-actions.c:98
-#: ../app/dialogs/preferences-dialog.c:1814
+#: ../app/actions/context-actions.c:58
+msgctxt "context-action"
 msgid "_Pattern"
 msgstr "�_��ลาย"
 
-#: ../app/actions/context-actions.c:53
+#: ../app/actions/context-actions.c:60
+msgctxt "context-action"
 msgid "_Palette"
 msgstr "_�า�สี"
 
-#: ../app/actions/context-actions.c:54
-#: ../app/dialogs/palette-import-dialog.c:217
-#: ../app/dialogs/preferences-dialog.c:1817
+#: ../app/actions/context-actions.c:62
+msgctxt "context-action"
 msgid "_Gradient"
 msgstr "สี�_ร��า"
 
-#: ../app/actions/context-actions.c:55
+#: ../app/actions/context-actions.c:64
+msgctxt "context-action"
 msgid "_Font"
 msgstr "���อั_�ษร"
 
-#: ../app/actions/context-actions.c:57
+#: ../app/actions/context-actions.c:67
+msgctxt "context-action"
 msgid "_Shape"
 msgstr "รู�_�ร�"
 
-#: ../app/actions/context-actions.c:58
+#: ../app/actions/context-actions.c:69
+msgctxt "context-action"
 msgid "_Radius"
 msgstr "_รัศมี"
 
-#: ../app/actions/context-actions.c:59
+#: ../app/actions/context-actions.c:71
+msgctxt "context-action"
 msgid "S_pikes"
 msgstr "�_��"
 
-#: ../app/actions/context-actions.c:60
+#: ../app/actions/context-actions.c:73
+msgctxt "context-action"
 msgid "_Hardness"
 msgstr "�_วามห�ั�"
 
-#: ../app/actions/context-actions.c:61
-msgid "_Aspect"
+#: ../app/actions/context-actions.c:75
+msgctxt "context-action"
+msgid "_Aspect Ratio"
 msgstr "_สั�ส�ว�"
 
-#: ../app/actions/context-actions.c:62
+#: ../app/actions/context-actions.c:77
+msgctxt "context-action"
 msgid "A_ngle"
 msgstr "มุ_ม"
 
-#: ../app/actions/context-actions.c:65
+#: ../app/actions/context-actions.c:80
+msgctxt "context-action"
 msgid "_Default Colors"
 msgstr "สี_�ริยาย"
 
-#: ../app/actions/context-actions.c:66
+#: ../app/actions/context-actions.c:82
+msgctxt "context-action"
 msgid "Set foreground color to black, background color to white"
 msgstr "�ำห���ห�สี�ื��ห��า����สี�ำ สี�ื��หลั�����สี�าว"
 
-#: ../app/actions/context-actions.c:71
+#: ../app/actions/context-actions.c:87
+msgctxt "context-action"
 msgid "S_wap Colors"
 msgstr "สลั_�สี"
 
-#: ../app/actions/context-actions.c:72
+#: ../app/actions/context-actions.c:88
+msgctxt "context-action"
 msgid "Exchange foreground and background colors"
-msgstr "สลั�สี�ั�ระหว�า�_สี�ี��ห��า�ละสี�ื��หลั�"
+msgstr "สลั�สี�ั�ระหว�า�สี�ี��ห��า�ละสี�ื��หลั�"
+
+#: ../app/actions/context-commands.c:426
+#, c-format
+msgid "Paint Mode: %s"
+msgstr "�หม��าร�าสี: %s"
+
+#: ../app/actions/context-commands.c:552
+#, c-format
+msgid "Brush Shape: %s"
+msgstr "รู��ร�หัว��ร�: %s"
+
+#: ../app/actions/context-commands.c:612
+#, c-format
+msgid "Brush Radius: %2.2f"
+msgstr ""
+
+#: ../app/actions/context-commands.c:720
+#, c-format
+msgid "Brush Angle: %2.2f"
+msgstr ""
 
 #: ../app/actions/cursor-info-actions.c:40
+#, fuzzy
+#| msgid "Pointer Information Menu"
+msgctxt "cursor-info-action"
 msgid "Pointer Information Menu"
 msgstr "�ม�ู�ัว�ี�อ�า���อมูล"
 
 #: ../app/actions/cursor-info-actions.c:47
-#: ../app/actions/sample-point-editor-actions.c:47
-#: ../app/widgets/gimpcursorview.c:191
+#, fuzzy
+#| msgid "_Sample Merged"
+msgctxt "cursor-info-action"
 msgid "_Sample Merged"
 msgstr "_ภา�รวม"
 
 #: ../app/actions/cursor-info-actions.c:48
-#: ../app/actions/sample-point-editor-actions.c:48
-msgid "Sample Merged"
-msgstr "ภา�รวม"
+#, fuzzy
+#| msgid "Base selection on all visible layers"
+msgctxt "cursor-info-action"
+msgid "Use the composite color of all visible layers"
+msgstr "�ลือ��า��ุ��ั���า��ี�มอ��ห���"
 
-#: ../app/actions/data-commands.c:102 ../app/actions/documents-commands.c:319
-#: ../app/actions/file-commands.c:176 ../app/dialogs/file-open-dialog.c:204
-#: ../app/dialogs/file-open-dialog.c:255
-#: ../app/dialogs/file-open-location-dialog.c:212
-#: ../app/display/gimpdisplayshell-dnd.c:452
-#: ../app/widgets/gimplayertreeview.c:763 ../app/widgets/gimptoolbox-dnd.c:157
-#: ../app/widgets/gimptoolbox.c:913
+#: ../app/actions/data-commands.c:104 ../app/actions/documents-commands.c:343
+#: ../app/actions/file-commands.c:194 ../app/dialogs/file-open-dialog.c:221
+#: ../app/dialogs/file-open-dialog.c:266
+#: ../app/dialogs/file-open-location-dialog.c:213
+#: ../app/dialogs/file-open-location-dialog.c:225
+#: ../app/display/gimpdisplayshell-dnd.c:552
+#: ../app/widgets/gimplayertreeview.c:762 ../app/widgets/gimptoolbox-dnd.c:178
+#: ../app/widgets/gimptoolbox.c:1229
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -822,771 +1032,1507 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/actions/data-commands.c:128 ../app/core/gimpbrushgenerated.c:611
-#: ../app/core/gimpimage.c:1330 ../app/core/gimppalette-import.c:223
-#: ../app/core/gimppalette.c:479 ../app/core/gimppalette.c:589
-#: ../app/dialogs/palette-import-dialog.c:771 ../app/pdb/image_cmds.c:1880
-#: ../app/widgets/gimpdnd-xds.c:97
+#: ../app/actions/data-commands.c:133
+#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1522
+#: ../app/core/gimppalette-import.c:210 ../app/core/gimppalette-load.c:223
+#: ../app/core/gimppalette.c:378 ../app/dialogs/palette-import-dialog.c:771
+#: ../app/widgets/gimpdnd-xds.c:94
 msgid "Untitled"
 msgstr "ยั��ม��ั���ื�อ"
 
-#: ../app/actions/data-commands.c:224
+#: ../app/actions/data-commands.c:238
 msgid "Delete Object"
 msgstr "ล�วั��ุ"
 
-#: ../app/actions/data-commands.c:247
+#: ../app/actions/data-commands.c:261
 #, c-format
-msgid "Are you sure you want to delete '%s' from the list and from disk?"
-msgstr "�ุ������หรือว�า��อ��ารล� '%s' �า�ราย�าร�ละ�ิส��?"
-
-#: ../app/actions/dialogs-actions.c:38
-msgid "_Dialogs"
-msgstr "_�ล�อ�����อ�"
-
-#: ../app/actions/dialogs-actions.c:39
-msgid "Create New Doc_k"
-msgstr "สร�า�สำ_รั��า��หม�"
+msgid "Delete '%s'?"
+msgstr "ล� '%s' หรือ�ม�?"
 
-#: ../app/actions/dialogs-actions.c:42
-msgid "_Layers, Channels & Paths"
-msgstr "_�ั���า�, �����ล �ละ �ส���า�"
-
-#: ../app/actions/dialogs-actions.c:47
-msgid "_Brushes, Patterns & Gradients"
-msgstr "หั_ว��ร�, ���ลาย �ละ สี�ร��า"
-
-#: ../app/actions/dialogs-actions.c:52
-msgid "_Misc. Stuff"
-msgstr "_�ิ�า�ะ"
+#: ../app/actions/data-commands.c:264
+#, c-format
+msgid ""
+"Are you sure you want to remove '%s' from the list and delete it on disk?"
+msgstr "�ุ������หรือว�า��อ��าร�อา '%s' ออ��า�ราย�าร�ละล�ออ��า��ิส��?"
 
-#: ../app/actions/dialogs-actions.c:57
+#: ../app/actions/dialogs-actions.c:44
+msgctxt "windows-action"
 msgid "Tool_box"
 msgstr "�ล�_อ���รื�อ�มือ"
 
-#: ../app/actions/dialogs-actions.c:65
+#: ../app/actions/dialogs-actions.c:50
+msgctxt "dialogs-action"
 msgid "Tool _Options"
-msgstr "�ัว�ลือ_���รื�อ�มือ"
+msgstr "�ัว�ลือ_��อ���รื�อ�มือ"
+
+#: ../app/actions/dialogs-actions.c:51
+msgctxt "dialogs-action"
+msgid "Open the tool options dialog"
+msgstr "��ิ��ล�อ�����อ��ัว�ลือ��อ���รื�อ�มือ"
 
-#: ../app/actions/dialogs-actions.c:70
+#: ../app/actions/dialogs-actions.c:56
+msgctxt "dialogs-action"
 msgid "_Device Status"
 msgstr "ส_�า�ะอุ��ร��"
 
-#: ../app/actions/dialogs-actions.c:70 ../app/dialogs/dialogs.c:133
-msgid "Device Status"
-msgstr "ส�า�ะอุ��ร��"
+#: ../app/actions/dialogs-actions.c:57
+#, fuzzy
+#| msgid "Open the gradient selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the device status dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ�สี�ร��า"
 
-#: ../app/actions/dialogs-actions.c:75
+#: ../app/actions/dialogs-actions.c:62
+msgctxt "dialogs-action"
 msgid "_Layers"
 msgstr "�ั��_�า�"
 
-#: ../app/actions/dialogs-actions.c:80
+#: ../app/actions/dialogs-actions.c:63
+#, fuzzy
+#| msgid "Open the pattern selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the layers dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ����ลาย"
+
+#: ../app/actions/dialogs-actions.c:68
+msgctxt "dialogs-action"
 msgid "_Channels"
 msgstr "_�����ล"
 
-#: ../app/actions/dialogs-actions.c:85
+#: ../app/actions/dialogs-actions.c:69
+#, fuzzy
+#| msgid "Open the font selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the channels dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ����อั�ษร"
+
+#: ../app/actions/dialogs-actions.c:74
+msgctxt "dialogs-action"
 msgid "_Paths"
 msgstr "�ส��_�า�"
 
-#: ../app/actions/dialogs-actions.c:90
+#: ../app/actions/dialogs-actions.c:75
+#, fuzzy
+#| msgid "Open the pattern selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the paths dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ����ลาย"
+
+#: ../app/actions/dialogs-actions.c:80
+msgctxt "dialogs-action"
 msgid "Color_map"
 msgstr "�ั_�สี"
 
-#: ../app/actions/dialogs-actions.c:90 ../app/dialogs/convert-dialog.c:171
-#: ../app/dialogs/dialogs.c:181
-msgid "Colormap"
-msgstr "�ั�สี"
+#: ../app/actions/dialogs-actions.c:81
+#, fuzzy
+#| msgid "Open the font selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the colormap dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ����อั�ษร"
 
-#: ../app/actions/dialogs-actions.c:95
+#: ../app/actions/dialogs-actions.c:86
+#, fuzzy
+#| msgid "Histogra_m"
+msgctxt "dialogs-action"
 msgid "Histogra_m"
 msgstr "�_รา�ส�ิ�ิ�วาม�ี�"
 
-#: ../app/actions/dialogs-actions.c:95 ../app/dialogs/dialogs.c:185
-msgid "Histogram"
-msgstr "�รา�ส�ิ�ิ�วาม�ี�"
+#: ../app/actions/dialogs-actions.c:87
+#, fuzzy
+#| msgid "Open the brush selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the histogram dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ�หัว��ร�"
 
-#: ../app/actions/dialogs-actions.c:100
+#: ../app/actions/dialogs-actions.c:92
+#, fuzzy
+#| msgid "_Selection Editor"
+msgctxt "dialogs-action"
 msgid "_Selection Editor"
-msgstr "�ัว����_��ื���ี��ลือ�"
+msgstr "��รื�อ�มือ�_�����ื���ี��ลือ�"
 
-#: ../app/actions/dialogs-actions.c:100 ../app/dialogs/dialogs.c:189
-msgid "Selection Editor"
-msgstr "�ัว������ื���ี��ลือ�"
+#: ../app/actions/dialogs-actions.c:93
+#, fuzzy
+#| msgid "Open the font selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the selection editor"
+msgstr "��ิ��ล�อ�����อ��ลือ����อั�ษร"
 
-#: ../app/actions/dialogs-actions.c:105
+#: ../app/actions/dialogs-actions.c:98
+msgctxt "dialogs-action"
 msgid "Na_vigation"
 msgstr "�าร�ำ_�า�"
 
-#: ../app/actions/dialogs-actions.c:105 ../app/dialogs/dialogs.c:203
-msgid "Display Navigation"
-msgstr "�าร�ำ�า�ห��า��า��ส���ล"
+#: ../app/actions/dialogs-actions.c:99
+#, fuzzy
+#| msgid "Open the gradient selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the display navigation dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ�สี�ร��า"
 
-#: ../app/actions/dialogs-actions.c:110
+#: ../app/actions/dialogs-actions.c:104
+#, fuzzy
+#| msgid "Undo _History"
+msgctxt "dialogs-action"
 msgid "Undo _History"
 msgstr "�ระวั�ิ�าร�ลั�_�ื�"
 
-#: ../app/actions/dialogs-actions.c:110 ../app/dialogs/dialogs.c:193
-msgid "Undo History"
-msgstr "�ระวั�ิ�าร�ลั��ื�"
+#: ../app/actions/dialogs-actions.c:105
+#, fuzzy
+#| msgid "Open the font selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the undo history dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ����อั�ษร"
 
-#: ../app/actions/dialogs-actions.c:115 ../app/dialogs/dialogs.c:141
+#: ../app/actions/dialogs-actions.c:110
+msgctxt "dialogs-action"
 msgid "Pointer"
 msgstr "�ัว�ี�"
 
-#: ../app/actions/dialogs-actions.c:120
+#: ../app/actions/dialogs-actions.c:111
+#, fuzzy
+#| msgid "Open the font selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the pointer information dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ����อั�ษร"
+
+#: ../app/actions/dialogs-actions.c:116
+#, fuzzy
+#| msgid "_Sample Points"
+msgctxt "dialogs-action"
 msgid "_Sample Points"
 msgstr "�ุ�_�ัวอย�า�"
 
-#: ../app/actions/dialogs-actions.c:125
+#: ../app/actions/dialogs-actions.c:117
+#, fuzzy
+#| msgid "Open the font selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the sample points dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ����อั�ษร"
+
+#: ../app/actions/dialogs-actions.c:122
+msgctxt "dialogs-action"
 msgid "Colo_rs"
 msgstr "_สี"
 
-#: ../app/actions/dialogs-actions.c:125 ../app/dialogs/dialogs.c:209
-msgid "FG/BG Color"
-msgstr "สี�ื��ห��า/�ื��หลั�"
+#: ../app/actions/dialogs-actions.c:123
+#, fuzzy
+#| msgid "Open the font selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the FG/BG color dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ����อั�ษร"
 
-#: ../app/actions/dialogs-actions.c:130
+#: ../app/actions/dialogs-actions.c:128
+msgctxt "dialogs-action"
 msgid "_Brushes"
 msgstr "_หัว��ร�"
 
+#: ../app/actions/dialogs-actions.c:129
+#, fuzzy
+#| msgid "Open the brush selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the brushes dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ�หัว��ร�"
+
+#: ../app/actions/dialogs-actions.c:134
+msgctxt "dialogs-action"
+msgid "Brush Editor"
+msgstr "��รื�อ�มือ�����หัว��ร�"
+
 #: ../app/actions/dialogs-actions.c:135
+#, fuzzy
+#| msgid "Open the brush selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the brush editor"
+msgstr "��ิ��ล�อ�����อ��ลือ�หัว��ร�"
+
+#: ../app/actions/dialogs-actions.c:140
+msgctxt "dialogs-action"
+msgid "Paint Dynamics"
+msgstr ""
+
+#: ../app/actions/dialogs-actions.c:141
+#, fuzzy
+#| msgid "Open image dialog"
+msgctxt "dialogs-action"
+msgid "Open paint dynamics dialog"
+msgstr "�ล�อ�����อ�สำหรั���ิ�ภา�"
+
+#: ../app/actions/dialogs-actions.c:146
+#, fuzzy
+#| msgid "Gradient Editor"
+msgctxt "dialogs-action"
+msgid "Paint Dynamics Editor"
+msgstr "��รื�อ�มือ�����สี�ร��า"
+
+#: ../app/actions/dialogs-actions.c:147
+msgctxt "dialogs-action"
+msgid "Open the paint dynamics editor"
+msgstr ""
+
+#: ../app/actions/dialogs-actions.c:152
+msgctxt "dialogs-action"
 msgid "P_atterns"
 msgstr "��_�ลาย"
 
-#: ../app/actions/dialogs-actions.c:140
+#: ../app/actions/dialogs-actions.c:153
+#, fuzzy
+#| msgid "Open the pattern selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the patterns dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ����ลาย"
+
+#: ../app/actions/dialogs-actions.c:158
+msgctxt "dialogs-action"
 msgid "_Gradients"
 msgstr "สี�ร�_�า"
 
-#: ../app/actions/dialogs-actions.c:145
+#: ../app/actions/dialogs-actions.c:159
+#, fuzzy
+#| msgid "Open the gradient selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the gradients dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ�สี�ร��า"
+
+#: ../app/actions/dialogs-actions.c:164
+msgctxt "dialogs-action"
+msgid "Gradient Editor"
+msgstr "��รื�อ�มือ�����สี�ร��า"
+
+#: ../app/actions/dialogs-actions.c:165
+#, fuzzy
+#| msgid "Open the gradient selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the gradient editor"
+msgstr "��ิ��ล�อ�����อ��ลือ�สี�ร��า"
+
+#: ../app/actions/dialogs-actions.c:170
+msgctxt "dialogs-action"
 msgid "Pal_ettes"
 msgstr "�า_�สี"
 
-#: ../app/actions/dialogs-actions.c:150
+#: ../app/actions/dialogs-actions.c:171
+msgctxt "dialogs-action"
+msgid "Open the palettes dialog"
+msgstr "��ิ��ล�อ�����อ��า�สี"
+
+#: ../app/actions/dialogs-actions.c:176
+msgctxt "dialogs-action"
+msgid "Palette Editor"
+msgstr "��รื�อ�มือ������า�สี"
+
+#: ../app/actions/dialogs-actions.c:177
+#, fuzzy
+#| msgid "Open the palette selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the palette editor"
+msgstr "��ิ��ล�อ�����อ��ลือ��า�สี"
+
+#: ../app/actions/dialogs-actions.c:182
+#, fuzzy
+#| msgid "Tool Options"
+msgctxt "dialogs-action"
+msgid "Tool presets"
+msgstr "�ัว�ลือ��อ���รื�อ�มือ"
+
+#: ../app/actions/dialogs-actions.c:183
+#, fuzzy
+#| msgid "Open the pattern selection dialog"
+msgctxt "dialogs-action"
+msgid "Open tool presets dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ����ลาย"
+
+#: ../app/actions/dialogs-actions.c:188
+msgctxt "dialogs-action"
 msgid "_Fonts"
 msgstr "���_อั�ษร"
 
-#: ../app/actions/dialogs-actions.c:155
+#: ../app/actions/dialogs-actions.c:189
+#, fuzzy
+#| msgid "Open the font selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the fonts dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ����อั�ษร"
+
+#: ../app/actions/dialogs-actions.c:194
+#, fuzzy
+#| msgid "B_uffers"
+msgctxt "dialogs-action"
 msgid "B_uffers"
 msgstr "�หล��_�ั���อมูล"
 
-#: ../app/actions/dialogs-actions.c:160
+#: ../app/actions/dialogs-actions.c:195
+#, fuzzy
+#| msgid "Open the pattern selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the named buffers dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ����ลาย"
+
+#: ../app/actions/dialogs-actions.c:200
+msgctxt "dialogs-action"
 msgid "_Images"
-msgstr "_ภา��ั��หม�"
+msgstr "_ภา�"
 
-#: ../app/actions/dialogs-actions.c:165
+#: ../app/actions/dialogs-actions.c:201
+#, fuzzy
+#| msgid "Open image dialog"
+msgctxt "dialogs-action"
+msgid "Open the images dialog"
+msgstr "�ล�อ�����อ�สำหรั���ิ�ภา�"
+
+#: ../app/actions/dialogs-actions.c:206
+#, fuzzy
+#| msgid "Document Histor_y"
+msgctxt "dialogs-action"
 msgid "Document Histor_y"
 msgstr "ราย�าร�ระ_วั�ิ�อ�สาร"
 
-#: ../app/actions/dialogs-actions.c:170
-msgid "_Templates"
-msgstr "_�ม����"
+#: ../app/actions/dialogs-actions.c:207
+#, fuzzy
+#| msgid "Open the font selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the document history dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ����อั�ษร"
 
-#: ../app/actions/dialogs-actions.c:170 ../app/dialogs/dialogs.c:164
-msgid "Image Templates"
-msgstr "�ม������า�� �อ�ภา�"
+#: ../app/actions/dialogs-actions.c:212
+msgctxt "dialogs-action"
+msgid "_Templates"
+msgstr "�_ม����"
 
-#: ../app/actions/dialogs-actions.c:175
-msgid "T_ools"
-msgstr "�_�รื�อ�มือ"
+#: ../app/actions/dialogs-actions.c:213
+#, fuzzy
+#| msgid "Open image dialog"
+msgctxt "dialogs-action"
+msgid "Open the image templates dialog"
+msgstr "�ล�อ�����อ�สำหรั���ิ�ภา�"
 
-#: ../app/actions/dialogs-actions.c:180
+#: ../app/actions/dialogs-actions.c:218
+#, fuzzy
+#| msgid "Error Co_nsole"
+msgctxt "dialogs-action"
 msgid "Error Co_nsole"
 msgstr "�อ_���ล�ส����อ�ิ��ลา�"
 
-#: ../app/actions/dialogs-actions.c:190
+#: ../app/actions/dialogs-actions.c:219
+#, fuzzy
+#| msgid "Clear error console"
+msgctxt "dialogs-action"
+msgid "Open the error console"
+msgstr "ล�ล�า�ห��า��า��ส����อ�ิ��ลา�"
+
+#: ../app/actions/dialogs-actions.c:229
+msgctxt "dialogs-action"
 msgid "_Preferences"
-msgstr "_��า�รั�����"
+msgstr "_�รั�����"
 
-#: ../app/actions/dialogs-actions.c:195
+#: ../app/actions/dialogs-actions.c:230
+#, fuzzy
+#| msgid "Open the font selection dialog"
+msgctxt "dialogs-action"
+msgid "Open the preferences dialog"
+msgstr "��ิ��ล�อ�����อ��ลือ����อั�ษร"
+
+#: ../app/actions/dialogs-actions.c:235
+#, fuzzy
+#| msgid "Configure Input Devices"
+msgctxt "dialogs-action"
+msgid "_Input Devices"
+msgstr "�รั�����อุ��ร��อิ��ุ�"
+
+#: ../app/actions/dialogs-actions.c:236
+#, fuzzy
+#| msgid "Open the selected entry"
+msgctxt "dialogs-action"
+msgid "Open the input devices editor"
+msgstr "��ิ�ราย�าร�ี��ลือ�"
+
+#: ../app/actions/dialogs-actions.c:241
+#, fuzzy
+#| msgid "_Keyboard Shortcuts"
+msgctxt "dialogs-action"
 msgid "_Keyboard Shortcuts"
 msgstr "�����ิม��ลั�"
 
-#: ../app/actions/dialogs-actions.c:200
-msgid "_Module Manager"
-msgstr "�ัว�ั��าร�_ม�ูล"
+#: ../app/actions/dialogs-actions.c:242
+#, fuzzy
+#| msgid "_Save keyboard shortcuts on exit"
+msgctxt "dialogs-action"
+msgid "Open the keyboard shortcuts editor"
+msgstr "_�ั��ึ��ุ�มลั� �มื�อออ��า���ร��รม"
+
+#: ../app/actions/dialogs-actions.c:247
+#, fuzzy
+msgctxt "dialogs-action"
+msgid "_Modules"
+msgstr "��ร��รมย�อย"
 
-#: ../app/actions/dialogs-actions.c:205
+#: ../app/actions/dialogs-actions.c:248
+#, fuzzy
+#| msgid "Open image dialog"
+msgctxt "dialogs-action"
+msgid "Open the module manager dialog"
+msgstr "�ล�อ�����อ�สำหรั���ิ�ภา�"
+
+#: ../app/actions/dialogs-actions.c:253
+msgctxt "dialogs-action"
 msgid "_Tip of the Day"
 msgstr "_�ำ��ะ�ำ�ระ�ำวั�"
 
-#: ../app/actions/dialogs-actions.c:210
+#: ../app/actions/dialogs-actions.c:254
+msgctxt "dialogs-action"
+msgid "Show some helpful tips on using GIMP"
+msgstr ""
+
+#: ../app/actions/dialogs-actions.c:259
+msgctxt "dialogs-action"
 msgid "_About"
 msgstr "�_�ี�ยว�ั�"
 
-#: ../app/actions/dock-actions.c:43
+#: ../app/actions/dialogs-actions.c:260
+msgctxt "dialogs-action"
+msgid "About GIMP"
+msgstr "��ี�ยว�ั� GIMP"
+
+#: ../app/actions/dialogs-actions.c:304
+#: ../app/dialogs/preferences-dialog.c:1943 ../app/widgets/gimptoolbox.c:777
+msgid "Toolbox"
+msgstr "�ล�อ���รื�อ�มือ"
+
+#: ../app/actions/dialogs-actions.c:305
+#, fuzzy
+#| msgid "Raise tool"
+msgid "Raise the toolbox"
+msgstr "��รื�อ�มือสลั��ึ��"
+
+#: ../app/actions/dialogs-actions.c:309
+msgid "New Toolbox"
+msgstr "�ล�อ���รื�อ�มือ�หม�"
+
+#: ../app/actions/dialogs-actions.c:310
+msgid "Create a new toolbox"
+msgstr "สร�า��ล�อ���รื�อ�มือ�หม�"
+
+#: ../app/actions/dock-actions.c:45
+msgctxt "dock-action"
 msgid "M_ove to Screen"
 msgstr "_ย�าย���ี�ห��า�อ"
 
-#: ../app/actions/dock-actions.c:47
+#: ../app/actions/dock-actions.c:49
+#, fuzzy
+#| msgid "Close Dock"
+msgctxt "dock-action"
 msgid "Close Dock"
 msgstr "�ิ�สำรั��า�"
 
-#: ../app/actions/dock-actions.c:52 ../app/actions/view-actions.c:115
+#: ../app/actions/dock-actions.c:54
+#, fuzzy
+#| msgid "_Open Display..."
+msgctxt "dock-action"
 msgid "_Open Display..."
 msgstr "�_�ิ���อ��าร�ส���ล..."
 
-#: ../app/actions/dock-actions.c:60
+#: ../app/actions/dock-actions.c:55
+#, fuzzy
+#| msgid "Connect to another display"
+msgctxt "dock-action"
+msgid "Connect to another display"
+msgstr "�ิ���อ�ั�อี�ห��า�อ�ส���ล"
+
+#: ../app/actions/dock-actions.c:63
+#, fuzzy
+#| msgid "_Show Image Selection"
+msgctxt "dock-action"
 msgid "_Show Image Selection"
 msgstr "�ส���ัว��วย�ลือ�ภา�"
 
-#: ../app/actions/dock-actions.c:66
+#: ../app/actions/dock-actions.c:69
+#, fuzzy
+#| msgid "Auto _Follow Active Image"
+msgctxt "dock-action"
 msgid "Auto _Follow Active Image"
 msgstr "�ิ��ามภา��ี��ำลั��ู�����า���ยอั���มั�ิ"
 
-#: ../app/actions/dockable-actions.c:49
+#: ../app/actions/dockable-actions.c:48
+#, fuzzy
+#| msgid "Dialogs Menu"
+msgctxt "dockable-action"
 msgid "Dialogs Menu"
 msgstr "ราย�าร�ล�อ�����อ�"
 
 #: ../app/actions/dockable-actions.c:53
+msgctxt "dockable-action"
 msgid "_Add Tab"
 msgstr "�_�ิ�ม����"
 
-#: ../app/actions/dockable-actions.c:54
+#: ../app/actions/dockable-actions.c:55
+#, fuzzy
+#| msgid "_Preview Size"
+msgctxt "dockable-action"
 msgid "_Preview Size"
 msgstr "_��า��าร�ส���ัวอย�า�"
 
-#: ../app/actions/dockable-actions.c:55
+#: ../app/actions/dockable-actions.c:57
+#, fuzzy
+#| msgid "_Tab Style"
+msgctxt "dockable-action"
 msgid "_Tab Style"
 msgstr "รู_�����าร�ส������"
 
-#: ../app/actions/dockable-actions.c:58
+#: ../app/actions/dockable-actions.c:60
+msgctxt "dockable-action"
 msgid "_Close Tab"
 msgstr "�ิ_�����"
 
-#: ../app/actions/dockable-actions.c:63
+#: ../app/actions/dockable-actions.c:65
+#, fuzzy
+#| msgid "_Detach Tab"
+msgctxt "dockable-action"
 msgid "_Detach Tab"
 msgstr "�_ย�����"
 
-#: ../app/actions/dockable-actions.c:81
+#: ../app/actions/dockable-actions.c:84
+msgctxt "preview-size"
 msgid "_Tiny"
 msgstr "_�ิ�ว"
 
-#: ../app/actions/dockable-actions.c:82
+#: ../app/actions/dockable-actions.c:86
+msgctxt "preview-size"
 msgid "E_xtra Small"
-msgstr "�ล�_��ิ�ศษ"
+msgstr "�ล��_�ิ�ศษ"
 
-#: ../app/actions/dockable-actions.c:83
+#: ../app/actions/dockable-actions.c:88
+msgctxt "preview-size"
 msgid "_Small"
 msgstr "�_ล��"
 
-#: ../app/actions/dockable-actions.c:84
+#: ../app/actions/dockable-actions.c:90
+msgctxt "preview-size"
 msgid "_Medium"
-msgstr "�_ลา�"
+msgstr "_�ลา�"
 
-#: ../app/actions/dockable-actions.c:85
+#: ../app/actions/dockable-actions.c:92
+msgctxt "preview-size"
 msgid "_Large"
-msgstr "�ห_��"
+msgstr "�_ห��"
 
-#: ../app/actions/dockable-actions.c:86
+#: ../app/actions/dockable-actions.c:94
+msgctxt "preview-size"
 msgid "Ex_tra Large"
-msgstr "�ห��_�ิ�ศษ"
+msgstr "�ห���ิ_�ศษ"
 
-#: ../app/actions/dockable-actions.c:87
+#: ../app/actions/dockable-actions.c:96
+msgctxt "preview-size"
 msgid "_Huge"
 msgstr "�ห��_มา�"
 
-#: ../app/actions/dockable-actions.c:88
+#: ../app/actions/dockable-actions.c:98
+msgctxt "preview-size"
 msgid "_Enormous"
 msgstr "�ห��ม_หึมา"
 
-#: ../app/actions/dockable-actions.c:89
+#: ../app/actions/dockable-actions.c:100
+msgctxt "preview-size"
 msgid "_Gigantic"
-msgstr "�ห��ม�ห_ฬาร"
+msgstr "�ห��ม�หฬา_ร"
 
-#: ../app/actions/dockable-actions.c:94
+#: ../app/actions/dockable-actions.c:106
+msgctxt "tab-style"
 msgid "_Icon"
 msgstr "�_อ�อ�"
 
-#: ../app/actions/dockable-actions.c:95
+#: ../app/actions/dockable-actions.c:108
+msgctxt "tab-style"
 msgid "Current _Status"
-msgstr "ส_�า�ะ�ั��ุ�ั�"
+msgstr "_ส�า�ะ�ั��ุ�ั�"
 
-#: ../app/actions/dockable-actions.c:96
+#: ../app/actions/dockable-actions.c:110
+msgctxt "tab-style"
 msgid "_Text"
-msgstr "��_อ�วาม"
+msgstr "_��อ�วาม"
 
-#: ../app/actions/dockable-actions.c:97
+#: ../app/actions/dockable-actions.c:112
+msgctxt "tab-style"
 msgid "I_con & Text"
 msgstr "�อ_�อ��ละ��อ�วาม"
 
-#: ../app/actions/dockable-actions.c:98
+#: ../app/actions/dockable-actions.c:114
+msgctxt "tab-style"
 msgid "St_atus & Text"
 msgstr "ส�า_�ะ�ละ��อ�วาม"
 
-#: ../app/actions/dockable-actions.c:108
+#: ../app/actions/dockable-actions.c:124
+msgctxt "dockable-action"
+msgid "Loc_k Tab to Dock"
+msgstr ""
+
+#: ../app/actions/dockable-actions.c:126
+msgctxt "dockable-action"
+msgid "Protect this tab from being dragged with the mouse pointer"
+msgstr ""
+
+#: ../app/actions/dockable-actions.c:132
+msgctxt "dockable-action"
 msgid "Show _Button Bar"
-msgstr "�ส�����_�ุ�ม"
+msgstr "�ส������ุ�_ม"
 
-#: ../app/actions/dockable-actions.c:117
+#: ../app/actions/dockable-actions.c:141
+msgctxt "dockable-action"
 msgid "View as _List"
 msgstr "�ส������_ราย�าร"
 
-#: ../app/actions/dockable-actions.c:122
+#: ../app/actions/dockable-actions.c:146
+msgctxt "dockable-action"
 msgid "View as _Grid"
-msgstr "�ส�������ส��_�ิ�ั�"
+msgstr "�ส��������ว_�ารา�"
 
-#: ../app/actions/documents-actions.c:42
+#: ../app/actions/documents-actions.c:41
+msgctxt "documents-action"
 msgid "Documents Menu"
 msgstr "�ม�ู�อ�สาร"
 
-#: ../app/actions/documents-actions.c:46
+#: ../app/actions/documents-actions.c:45
+msgctxt "documents-action"
 msgid "_Open Image"
-msgstr "�_�ิ�ภา�"
+msgstr "_��ิ�ภา�"
 
-#: ../app/actions/documents-actions.c:47
+#: ../app/actions/documents-actions.c:46
+msgctxt "documents-action"
 msgid "Open the selected entry"
 msgstr "��ิ�ราย�าร�ี��ลือ�"
 
-#: ../app/actions/documents-actions.c:52
+#: ../app/actions/documents-actions.c:51
+#, fuzzy
+#| msgid "_Raise or Open Image"
+msgctxt "documents-action"
 msgid "_Raise or Open Image"
 msgstr "_ย��ึ��มาหรือ��ิ�ภา�"
 
-#: ../app/actions/documents-actions.c:53
+#: ../app/actions/documents-actions.c:52
+#, fuzzy
+#| msgid "Raise window if already open"
+msgctxt "documents-action"
 msgid "Raise window if already open"
 msgstr "ย�ระ�ั�ห��า��า��ึ����า��ิ��ว��ล�ว"
 
-#: ../app/actions/documents-actions.c:58
+#: ../app/actions/documents-actions.c:57
+#, fuzzy
+#| msgid "File Open _Dialog"
+msgctxt "documents-action"
 msgid "File Open _Dialog"
 msgstr "_�ล�อ�����อ�สำหรั���ิ����ม"
 
-#: ../app/actions/documents-actions.c:59
+#: ../app/actions/documents-actions.c:58
+#, fuzzy
+#| msgid "Open image dialog"
+msgctxt "documents-action"
 msgid "Open image dialog"
 msgstr "�ล�อ�����อ�สำหรั���ิ�ภา�"
 
-#: ../app/actions/documents-actions.c:64
+#: ../app/actions/documents-actions.c:63
+msgctxt "documents-action"
 msgid "Copy Image _Location"
-msgstr "�ั�ลอ��ำ�ห������มภา�"
+msgstr "�ั�ลอ�_�ำ�ห������มภา�"
 
-#: ../app/actions/documents-actions.c:65
+#: ../app/actions/documents-actions.c:64
+msgctxt "documents-action"
 msgid "Copy image location to clipboard"
 msgstr "�ั�ลอ��ำ�ห������มภา����ี��ลิ��อร��"
 
-#: ../app/actions/documents-actions.c:70
+#: ../app/actions/documents-actions.c:69
+msgctxt "documents-action"
 msgid "Remove _Entry"
 msgstr "ล�_ราย�าร"
 
-#: ../app/actions/documents-actions.c:71
+#: ../app/actions/documents-actions.c:70
+msgctxt "documents-action"
 msgid "Remove the selected entry"
 msgstr "ล�ราย�าร�ี��ลือ�ออ�"
 
-#: ../app/actions/documents-actions.c:76
+#: ../app/actions/documents-actions.c:75
+msgctxt "documents-action"
 msgid "_Clear History"
-msgstr "ล�_�ระวั�ิ�อ�สาร"
+msgstr "ล�า�_�ระวั�ิ"
 
-#: ../app/actions/documents-actions.c:77
+#: ../app/actions/documents-actions.c:76
+msgctxt "documents-action"
 msgid "Clear the entire document history"
-msgstr "ล��ระวั�ิ�าร��ิ��อ�สาร�ั��หม�"
+msgstr "ล�า��ระวั�ิ�าร��ิ��อ�สาร�ั��หม�"
 
-#: ../app/actions/documents-actions.c:82
+#: ../app/actions/documents-actions.c:81
+#, fuzzy
+#| msgid "Recreate _Preview"
+msgctxt "documents-action"
 msgid "Recreate _Preview"
 msgstr "สร�า��าร�ส��_�ัวอย�า��หม�"
 
-#: ../app/actions/documents-actions.c:83
+#: ../app/actions/documents-actions.c:82
+#, fuzzy
+#| msgid "Recreate preview"
+msgctxt "documents-action"
 msgid "Recreate preview"
 msgstr "สร�า��าร�ส���ัวอย�า��หม�"
 
-#: ../app/actions/documents-actions.c:88
+#: ../app/actions/documents-actions.c:87
+#, fuzzy
+#| msgid "Reload _all Previews"
+msgctxt "documents-action"
 msgid "Reload _all Previews"
 msgstr "�หล��าร�ส���ัวอ_ย�า��หม��ั��หม�"
 
-#: ../app/actions/documents-actions.c:89
+#: ../app/actions/documents-actions.c:88
+#, fuzzy
+#| msgid "Reload all previews"
+msgctxt "documents-action"
 msgid "Reload all previews"
 msgstr "�หล��าร�ส���ัวอย�า��หม��ั��หม�"
 
-#: ../app/actions/documents-actions.c:94
+#: ../app/actions/documents-actions.c:93
+#, fuzzy
+#| msgid "Remove Dangling E_ntries"
+msgctxt "documents-action"
 msgid "Remove Dangling E_ntries"
 msgstr "ล�_ราย�าร�ี��ม�มีอยู��ริ�ออ�"
 
 #: ../app/actions/documents-actions.c:95
-msgid "Remove dangling entries"
-msgstr "ล�ราย�าร�ี��ม�มีอยู��ริ�ออ�"
+msgctxt "documents-action"
+msgid "Remove entries for which the corresponding file is not available"
+msgstr ""
 
-#: ../app/actions/documents-commands.c:197
+#: ../app/actions/documents-commands.c:192
 msgid "Clear Document History"
 msgstr "ล�า��ระวั�ิ�อ�สาร"
 
-#: ../app/actions/documents-commands.c:220
-msgid "Remove all entries from the document history?"
-msgstr "ล��ุ�ลำ�ั�ราย�ารออ��า�ราย�าร�ระวั�ิ�อ�สารหรือ�ม�?"
+#: ../app/actions/documents-commands.c:215
+#, fuzzy
+#| msgid "Clear the entire document history"
+msgid "Clear the Recent Documents list?"
+msgstr "ล��ระวั�ิ�าร��ิ��อ�สาร�ั��หม�"
 
-#: ../app/actions/documents-commands.c:224
+#: ../app/actions/documents-commands.c:218
+#, fuzzy
+#| msgid ""
+#| "Clearing the document history will permanently remove all currently "
+#| "listed entries."
 msgid ""
-"Clearing the document history will permanently remove all currently listed "
-"entries."
+"Clearing the document history will permanently remove all images from the "
+"recent documents list."
 msgstr "�ารล�า�ราย�าร�ระวั�ิ�ิ���า��ะล��ุ�ลำ�ั�ราย�ารออ�อย�า��าวร"
 
 #: ../app/actions/drawable-actions.c:45
-msgid "_Desaturate..."
-msgstr "_ล��วามอิ�มสี..."
-
-#: ../app/actions/drawable-actions.c:46
-msgid "Turn colors into shades of gray"
-msgstr "��ลี�ย���า�สี�ห�����ระ�ั�สี��า"
-
-#: ../app/actions/drawable-actions.c:51
+#, fuzzy
+#| msgid "_Equalize"
+msgctxt "drawable-action"
 msgid "_Equalize"
 msgstr "�_�ลี�ย�ห����า�ั�"
 
-#: ../app/actions/drawable-actions.c:52
+#: ../app/actions/drawable-actions.c:46
+#, fuzzy
+#| msgid "Automatic contrast enhancement"
+msgctxt "drawable-action"
 msgid "Automatic contrast enhancement"
 msgstr "�าร�ำ�ห���า�วาม��รีย���า��ี�ึ����ยอั���มั�ิ"
 
-#: ../app/actions/drawable-actions.c:57
+#: ../app/actions/drawable-actions.c:51
+msgctxt "drawable-action"
 msgid "In_vert"
 msgstr "_�ลั�สี"
 
-#: ../app/actions/drawable-actions.c:58
+#: ../app/actions/drawable-actions.c:52
+msgctxt "drawable-action"
 msgid "Invert the colors"
 msgstr "�ลั���าสี�����ร��ั���าม"
 
-#: ../app/actions/drawable-actions.c:63
+#: ../app/actions/drawable-actions.c:57
+msgctxt "drawable-action"
 msgid "_White Balance"
 msgstr "�รั�สม�ุลสี_�าว"
 
-#: ../app/actions/drawable-actions.c:64
+#: ../app/actions/drawable-actions.c:58
+#, fuzzy
+#| msgid "Automatic white balance correction"
+msgctxt "drawable-action"
 msgid "Automatic white balance correction"
 msgstr "������วามสม�ุลสี�าว��ยอั���มั�ิ"
 
-#: ../app/actions/drawable-actions.c:69
+#: ../app/actions/drawable-actions.c:63
+#, fuzzy
+#| msgid "_Offset..."
+msgctxt "drawable-action"
 msgid "_Offset..."
 msgstr "�_ลื�อ�ภา�..."
 
-#: ../app/actions/drawable-actions.c:70
+#: ../app/actions/drawable-actions.c:65
+#, fuzzy
+#| msgid "Shift the pixels, optionally wrapping them at the borders"
+msgctxt "drawable-action"
 msgid "Shift the pixels, optionally wrapping them at the borders"
 msgstr "�ลื�อ��ิ���ล ��ย�ลือ����ว�า�ะว��ะลุ�อ����หรือ�ม�"
 
-#: ../app/actions/drawable-actions.c:78 ../app/actions/vectors-actions.c:153
+#: ../app/actions/drawable-actions.c:73
+msgctxt "drawable-action"
+msgid "_Visible"
+msgstr "_�รา��"
+
+#: ../app/actions/drawable-actions.c:74
+msgctxt "drawable-action"
+msgid "Toggle visibility"
+msgstr "��ิ��ิ��าร�รา���อ�วั��ุ"
+
+#: ../app/actions/drawable-actions.c:80
+msgctxt "drawable-action"
 msgid "_Linked"
 msgstr "�_�ื�อม�ย�"
 
-#: ../app/actions/drawable-actions.c:79
+#: ../app/actions/drawable-actions.c:81
+msgctxt "drawable-action"
 msgid "Toggle the linked state"
 msgstr "��ิ��ิ�ส�า�ะ�าร��ื�อม�ย�"
 
-#: ../app/actions/drawable-actions.c:85 ../app/actions/vectors-actions.c:147
-msgid "_Visible"
-msgstr "_มอ��ห��"
+#. GIMP_STOCK_LOCK
+#: ../app/actions/drawable-actions.c:87
+#, fuzzy
+#| msgid "pixels"
+msgctxt "drawable-action"
+msgid "L_ock pixels"
+msgstr "�ุ�ภา�"
 
-#: ../app/actions/drawable-actions.c:86
-msgid "Toggle visibility"
-msgstr "��ิ��ิ��ารมอ��ห��วั��ุ"
+#: ../app/actions/drawable-actions.c:89
+#, fuzzy
+msgctxt "drawable-action"
+msgid "Keep the pixels on this drawable from being modified"
+msgstr "����อมูล�วาม��ร���ส�อ��ั���า��ี�"
 
-#: ../app/actions/drawable-actions.c:95 ../app/actions/image-actions.c:165
+#: ../app/actions/drawable-actions.c:98
+msgctxt "drawable-action"
 msgid "Flip _Horizontally"
-msgstr "�ลั�ภา���ว_�อ�"
+msgstr "�ลิ�ภา���ว_�อ�"
 
-#: ../app/actions/drawable-actions.c:96
-#, fuzzy
+#: ../app/actions/drawable-actions.c:99
+msgctxt "drawable-action"
 msgid "Flip horizontally"
-msgstr "�ลั�ภา���ว�อ�"
+msgstr "�ลิ�ภา���ว�อ�"
 
-#: ../app/actions/drawable-actions.c:101 ../app/actions/image-actions.c:171
+#: ../app/actions/drawable-actions.c:104
+msgctxt "drawable-action"
 msgid "Flip _Vertically"
-msgstr "�ลั�ภา���ว_�ั��"
+msgstr "�ลิ�ภา���ว_�ั��"
 
-#: ../app/actions/drawable-actions.c:102
+#: ../app/actions/drawable-actions.c:105
+msgctxt "drawable-action"
 msgid "Flip vertically"
-msgstr "�ลั�ภา���ว�ั��"
+msgstr "�ลิ�ภา���ว�ั��"
 
-#: ../app/actions/drawable-actions.c:110 ../app/actions/image-actions.c:180
+#: ../app/actions/drawable-actions.c:113
+msgctxt "drawable-action"
 msgid "Rotate 90° _clockwise"
 msgstr "หมุ� 90° _�าม���ม�าฬิ�า"
 
-#: ../app/actions/drawable-actions.c:111
+#: ../app/actions/drawable-actions.c:114
+msgctxt "drawable-action"
 msgid "Rotate 90 degrees to the right"
 msgstr "หมุ� 90 อ�ศา���า��วา"
 
-#: ../app/actions/drawable-actions.c:116 ../app/actions/image-actions.c:186
+#: ../app/actions/drawable-actions.c:119
+msgctxt "drawable-action"
 msgid "Rotate _180°"
 msgstr "หมุ� _180°"
 
-#: ../app/actions/drawable-actions.c:117
+#: ../app/actions/drawable-actions.c:120
+msgctxt "drawable-action"
 msgid "Turn upside-down"
 msgstr "หมุ��ลั�หัว"
 
-#: ../app/actions/drawable-actions.c:122 ../app/actions/image-actions.c:192
+#: ../app/actions/drawable-actions.c:125
+msgctxt "drawable-action"
 msgid "Rotate 90° counter-clock_wise"
 msgstr "หมุ� 90° _�ว����ม�าฬิ�า"
 
-#: ../app/actions/drawable-actions.c:123
+#: ../app/actions/drawable-actions.c:126
+msgctxt "drawable-action"
 msgid "Rotate 90 degrees to the left"
 msgstr "หมุ� 90 อ�ศา���า���าย"
 
-#: ../app/actions/drawable-commands.c:74
-msgid "Desaturate operates only on RGB color layers."
-msgstr "�ารล��วามอิ�มสี���������าะ�ั���า��ี����ระ��สี RGB"
-
-#: ../app/actions/drawable-commands.c:99
+#: ../app/actions/drawable-commands.c:63
 msgid "Equalize does not operate on indexed layers."
 msgstr "�าร��ลี�ย�ห����า�ั��ม�สามาร��������ั��ั���า�����ั��ีสี"
 
-#: ../app/actions/drawable-commands.c:117
+#: ../app/actions/drawable-commands.c:87
 msgid "Invert does not operate on indexed layers."
 msgstr "�าร�ลั���าสี�ม�สามาร�����า�������ั���า�����ั��ีสี"
 
-#: ../app/actions/drawable-commands.c:137
+#: ../app/actions/drawable-commands.c:111
 msgid "White Balance operates only on RGB color layers."
 msgstr "�าร�รั�สม�ุลสี�าว����า�������าะระ��สี��� RGB"
 
-#: ../app/actions/edit-actions.c:61
+#: ../app/actions/dynamics-actions.c:42
+#, fuzzy
+#| msgid "Patterns Menu"
+msgctxt "dynamics-action"
+msgid "Paint Dynamics Menu"
+msgstr "ราย�าร���ลาย"
+
+#: ../app/actions/dynamics-actions.c:46
+msgctxt "dynamics-action"
+msgid "_New Dynamics"
+msgstr ""
+
+#: ../app/actions/dynamics-actions.c:47
+#, fuzzy
+msgctxt "dynamics-action"
+msgid "Create a new dynamics"
+msgstr "สร�า�ภา��หม�"
+
+#: ../app/actions/dynamics-actions.c:52
+#, fuzzy
+#| msgid "D_uplicate Path"
+msgctxt "dynamics-action"
+msgid "D_uplicate Dynamics"
+msgstr "สำ�_�า�ส���า�"
+
+#: ../app/actions/dynamics-actions.c:53
+#, fuzzy
+#| msgid "Duplicate path"
+msgctxt "dynamics-action"
+msgid "Duplicate this dynamics"
+msgstr "สำ��า�ส���า�"
+
+#: ../app/actions/dynamics-actions.c:58
+#, fuzzy
+#| msgid "Copy Brush _Location"
+msgctxt "dynamics-action"
+msgid "Copy Dynamics _Location"
+msgstr "�ั�ลอ��ำ�ห���_หัว��ร�"
+
+#: ../app/actions/dynamics-actions.c:59
+#, fuzzy
+#| msgid "Copy brush file location to clipboard"
+msgctxt "dynamics-action"
+msgid "Copy dynamics file location to clipboard"
+msgstr "�ั�ลอ��ำ�ห������มหัว��ร����ี��ลิ��อร��"
+
+#: ../app/actions/dynamics-actions.c:64
+#, fuzzy
+#| msgid "Delete Anchors"
+msgctxt "dynamics-action"
+msgid "_Delete Dynamics"
+msgstr "ล��ุ�สมอ"
+
+#: ../app/actions/dynamics-actions.c:65
+#, fuzzy
+#| msgid "Delete this image"
+msgctxt "dynamics-action"
+msgid "Delete this dynamics"
+msgstr "ล�ภา��ี�"
+
+#: ../app/actions/dynamics-actions.c:70
+#, fuzzy
+#| msgid "_Refresh Gradients"
+msgctxt "dynamics-action"
+msgid "_Refresh Dynamicss"
+msgstr "�รีย_�สี�ร��า�หม�"
+
+#: ../app/actions/dynamics-actions.c:71
+#, fuzzy
+#| msgid "Refresh gradients"
+msgctxt "dynamics-action"
+msgid "Refresh dynamics"
+msgstr "�รีย�สี�ร��า�หม�"
+
+#: ../app/actions/dynamics-actions.c:79
+#, fuzzy
+#| msgid "_Edit Gradient..."
+msgctxt "dynamics-action"
+msgid "_Edit Dynamics..."
+msgstr "�_����สี�ร��า..."
+
+#: ../app/actions/dynamics-actions.c:80
+msgctxt "dynamics-action"
+msgid "Edit dynamics"
+msgstr ""
+
+#: ../app/actions/dynamics-editor-actions.c:42
+#, fuzzy
+#| msgid "Gradient Editor Menu"
+msgctxt "dynamics-editor-action"
+msgid "Paint Dynamics Editor Menu"
+msgstr "�ม�ู��รื�อ�มือ�����สี�ร��า"
+
+#: ../app/actions/dynamics-editor-actions.c:50
+#, fuzzy
+#| msgid "Edit Active Brush"
+msgctxt "dynamics-editor-action"
+msgid "Edit Active Dynamics"
+msgstr "�����หัว��ร��ี�����า�อยู�"
+
+#: ../app/actions/edit-actions.c:63
+#, fuzzy
+#| msgid "_Edit"
+msgctxt "edit-action"
 msgid "_Edit"
-msgstr "����_�"
+msgstr "�_����"
 
-#: ../app/actions/edit-actions.c:62
-msgid "_Paste as"
+#: ../app/actions/edit-actions.c:64
+#, fuzzy
+#| msgid "_Paste as"
+msgctxt "edit-action"
+msgid "Paste _as"
 msgstr "�_�ะ������"
 
-#: ../app/actions/edit-actions.c:63
+#: ../app/actions/edit-actions.c:65
+#, fuzzy
+#| msgid "_Buffer"
+msgctxt "edit-action"
 msgid "_Buffer"
 msgstr "�หล��_�ั���อมูล"
 
-#: ../app/actions/edit-actions.c:66
+#: ../app/actions/edit-actions.c:68
+#, fuzzy
+#| msgid "Undo History Menu"
+msgctxt "edit-action"
 msgid "Undo History Menu"
-msgstr "�ม�ู�ระวั�ิ�าร�ลั��ื�"
+msgstr "�ม�ู�ระวั�ิ�าร�รีย��ื�"
 
-#: ../app/actions/edit-actions.c:70 ../app/actions/edit-actions.c:277
+#: ../app/actions/edit-actions.c:72
+#, fuzzy
+#| msgid "_Undo"
+msgctxt "edit-action"
 msgid "_Undo"
-msgstr "_�ลั��ื�"
+msgstr "�รี_ย��ื�"
 
-#: ../app/actions/edit-actions.c:71
+#: ../app/actions/edit-actions.c:73
+#, fuzzy
+#| msgid "Undo the last operation"
+msgctxt "edit-action"
 msgid "Undo the last operation"
-msgstr "�ลั��ื���ิ�ั�ิ�ารล�าสุ�"
+msgstr "�รีย��ื���ิ�ั�ิ�ารล�าสุ�"
 
-#: ../app/actions/edit-actions.c:76 ../app/actions/edit-actions.c:278
+#: ../app/actions/edit-actions.c:78
+#, fuzzy
+#| msgid "_Redo"
+msgctxt "edit-action"
 msgid "_Redo"
 msgstr "_�ำ��ำ"
 
-#: ../app/actions/edit-actions.c:77
+#: ../app/actions/edit-actions.c:79
+#, fuzzy
+#| msgid "Redo the last operation that was undone"
+msgctxt "edit-action"
 msgid "Redo the last operation that was undone"
-msgstr "�ำ��ำ��ิ�ั�ิ�าร�ี��ู��ลั��ื�ล�าสุ�"
+msgstr "�ำ��ำ��ิ�ั�ิ�าร�ี��ู��รีย��ื�ล�าสุ�"
 
-#: ../app/actions/edit-actions.c:82
+#: ../app/actions/edit-actions.c:84
+#, fuzzy
+#| msgid "Strong Undo"
+msgctxt "edit-action"
 msgid "Strong Undo"
-msgstr "�ลั��ื�����ร�"
+msgstr "�รีย��ื�����ร�"
 
-#: ../app/actions/edit-actions.c:83
+#: ../app/actions/edit-actions.c:85
+#, fuzzy
+#| msgid "Undo the last operation, skipping visibility changes"
+msgctxt "edit-action"
 msgid "Undo the last operation, skipping visibility changes"
-msgstr "�ลั��ื���ิ�ั�ิ�ารล�าสุ� ��าม�าร��ลี�ย���ล��ี�มอ��ห��"
+msgstr "�รีย��ื���ิ�ั�ิ�ารล�าสุ� ��าม�าร��ลี�ย���ล��ี�มอ��ห��"
 
-#: ../app/actions/edit-actions.c:88
+#: ../app/actions/edit-actions.c:90
+#, fuzzy
+#| msgid "Strong Redo"
+msgctxt "edit-action"
 msgid "Strong Redo"
 msgstr "�ำ��ำ����ร�"
 
-#: ../app/actions/edit-actions.c:89
+#: ../app/actions/edit-actions.c:92
+#, fuzzy
+#| msgid "Redo the last operation that was undone, skipping visibility changes"
+msgctxt "edit-action"
 msgid "Redo the last operation that was undone, skipping visibility changes"
-msgstr "�ำ��ำ��ิ�ั�ิ�าร�ี��ู��ลั��ื�ล�าสุ� ��าม�าร��ลี�ย���ล��ี�มอ��ห��"
+msgstr "�ำ��ำ��ิ�ั�ิ�าร�ี��ู��รีย��ื�ล�าสุ� ��าม�าร��ลี�ย���ล��ี�มอ��ห��"
 
-#: ../app/actions/edit-actions.c:94
+#: ../app/actions/edit-actions.c:97
+#, fuzzy
+#| msgid "_Clear Undo History"
+msgctxt "edit-action"
 msgid "_Clear Undo History"
-msgstr "ล�า�_�ระวั�ิ�าร�ลั��ื�"
+msgstr "ล�า�_�ระวั�ิ�าร�รีย��ื�"
 
-#: ../app/actions/edit-actions.c:95
+#: ../app/actions/edit-actions.c:98
+#, fuzzy
+#| msgid "Remove all operations from the undo history"
+msgctxt "edit-action"
 msgid "Remove all operations from the undo history"
-msgstr "ล�ราย�าร�ระวั�ิ�าร�ลั��ื��ั��หม��อ�ภา����หรือ�ม�?"
+msgstr "ล�ราย�าร�ระวั�ิ�าร�รีย��ื��ั��หม��อ�ภา����หรือ�ม�?"
+
+#: ../app/actions/edit-actions.c:103
+#, fuzzy
+#| msgid "_New..."
+msgctxt "edit-action"
+msgid "_Fade..."
+msgstr "�_หม�..."
 
-#: ../app/actions/edit-actions.c:100
+#: ../app/actions/edit-actions.c:105
+msgctxt "edit-action"
+msgid "Modify paint mode and opacity of the last pixel manipulation"
+msgstr ""
+
+#: ../app/actions/edit-actions.c:110
+msgctxt "edit-action"
 msgid "Cu_t"
 msgstr "�ั_�"
 
-#: ../app/actions/edit-actions.c:101
+#: ../app/actions/edit-actions.c:111
+#, fuzzy
+#| msgid "Move the selected pixels to the clipboard"
+msgctxt "edit-action"
 msgid "Move the selected pixels to the clipboard"
 msgstr "ย�าย�ิ���ล�ี��ลือ��ั��หม���ยั��ลิ��อร��"
 
-#: ../app/actions/edit-actions.c:106
+#: ../app/actions/edit-actions.c:116
+msgctxt "edit-action"
 msgid "_Copy"
 msgstr "�ั�_ลอ�"
 
-#: ../app/actions/edit-actions.c:107
+#: ../app/actions/edit-actions.c:117
+#, fuzzy
+#| msgid "Copy the selected pixels to the clipboard"
+msgctxt "edit-action"
 msgid "Copy the selected pixels to the clipboard"
 msgstr "�ั�ลอ��ิ���ล�ี��ลือ��ั��หม���ยั��ลิ��อร��"
 
 #. GIMP_STOCK_COPY_VISIBLE,
-#: ../app/actions/edit-actions.c:112
+#: ../app/actions/edit-actions.c:122
+#, fuzzy
+#| msgid "Copy _Visible"
+msgctxt "edit-action"
 msgid "Copy _Visible"
 msgstr "�ั�ลอ����าะ�ี�มอ��_ห��"
 
-#: ../app/actions/edit-actions.c:113
-msgid "Copy the selected region to the clipboard"
-msgstr "�ั�ลอ��อ�����ี��ลือ���ยั��ลิ��อร��"
+#: ../app/actions/edit-actions.c:123
+#, fuzzy
+#| msgid "Cannot float selection because the selected region is empty."
+msgctxt "edit-action"
+msgid "Copy what is visible in the selected region"
+msgstr "�ม�สามาร�ลอย�ัว�ื���ี��ลือ������ื�อ��า������ื���ี��ว�า�"
 
-#: ../app/actions/edit-actions.c:118
+#: ../app/actions/edit-actions.c:128
+msgctxt "edit-action"
 msgid "_Paste"
 msgstr "�_�ะ"
 
-#: ../app/actions/edit-actions.c:119
+#: ../app/actions/edit-actions.c:129
+msgctxt "edit-action"
 msgid "Paste the content of the clipboard"
 msgstr "��ะ��อมูล�า��ลิ��อร��"
 
-#: ../app/actions/edit-actions.c:124
+#: ../app/actions/edit-actions.c:134
+msgctxt "edit-action"
 msgid "Paste _Into"
 msgstr "��ะ_ล���"
 
-#: ../app/actions/edit-actions.c:125
+#: ../app/actions/edit-actions.c:136
+#, fuzzy
+#| msgid "Paste the content of the clipboard into the current selection"
+msgctxt "edit-action"
 msgid "Paste the content of the clipboard into the current selection"
 msgstr "��ะ��อมูล�า��ลิ��อร��ล����ื���ี��ลือ�"
 
-#: ../app/actions/edit-actions.c:130
-msgid "Paste as New"
-msgstr "��ะ����ภา��_หม�"
+#: ../app/actions/edit-actions.c:141
+msgctxt "edit-action"
+msgid "From _Clipboard"
+msgstr "�า�_�ลิ��อร��"
 
-#: ../app/actions/edit-actions.c:131 ../app/actions/edit-actions.c:137
+#: ../app/actions/edit-actions.c:142 ../app/actions/edit-actions.c:148
+#, fuzzy
+#| msgid "Create a new image from the content of the clipboard"
+msgctxt "edit-action"
 msgid "Create a new image from the content of the clipboard"
 msgstr "สร�า�ภา��หม��า���อมูล���ลิ��อร��"
 
-#: ../app/actions/edit-actions.c:136
+#: ../app/actions/edit-actions.c:147
+msgctxt "edit-action"
 msgid "_New Image"
 msgstr "ภา��ห_ม�"
 
-#: ../app/actions/edit-actions.c:142
+#: ../app/actions/edit-actions.c:153
+msgctxt "edit-action"
+msgid "New _Layer"
+msgstr "_�ั���า��หม�"
+
+#: ../app/actions/edit-actions.c:154
+#, fuzzy
+#| msgid "Create a new image from the content of the clipboard"
+msgctxt "edit-action"
+msgid "Create a new layer from the content of the clipboard"
+msgstr "สร�า�ภา��หม��า���อมูล���ลิ��อร��"
+
+#: ../app/actions/edit-actions.c:159
+#, fuzzy
+#| msgid "Cu_t Named..."
+msgctxt "edit-action"
 msgid "Cu_t Named..."
 msgstr "_�ั��ล�ว�ั���ื�อ..."
 
-#: ../app/actions/edit-actions.c:147
+#: ../app/actions/edit-actions.c:160
+#, fuzzy
+#| msgid "Move the selected pixels to the clipboard"
+msgctxt "edit-action"
+msgid "Move the selected pixels to a named buffer"
+msgstr "ย�าย�ิ���ล�ี��ลือ��ั��หม���ยั��ลิ��อร��"
+
+#: ../app/actions/edit-actions.c:165
+#, fuzzy
+#| msgid "_Copy Named..."
+msgctxt "edit-action"
 msgid "_Copy Named..."
 msgstr "_�ั�ลอ��ล�ว�ั���ื�อ..."
 
+#: ../app/actions/edit-actions.c:166
+#, fuzzy
+#| msgid "Copy the selected pixels to the clipboard"
+msgctxt "edit-action"
+msgid "Copy the selected pixels to a named buffer"
+msgstr "�ั�ลอ��ิ���ล�ี��ลือ��ั��หม���ยั��ลิ��อร��"
+
 #. GIMP_STOCK_COPY_VISIBLE,
-#: ../app/actions/edit-actions.c:152
+#: ../app/actions/edit-actions.c:171
+#, fuzzy
+#| msgid "Copy _Visible Named..."
+msgctxt "edit-action"
 msgid "Copy _Visible Named..."
 msgstr "�ั�ลอ��ี��_ห���ล�ว�ั���ื�อ..."
 
-#: ../app/actions/edit-actions.c:157
+#: ../app/actions/edit-actions.c:173
+#, fuzzy
+#| msgid "Copy the selected region to the clipboard"
+msgctxt "edit-action"
+msgid "Copy what is visible in the selected region to a named buffer"
+msgstr "�ั�ลอ��อ�����ี��ลือ���ยั��ลิ��อร��"
+
+#: ../app/actions/edit-actions.c:178
+#, fuzzy
+#| msgid "_Paste Named..."
+msgctxt "edit-action"
 msgid "_Paste Named..."
 msgstr "�_�ะ�า��ื�อ�ี��ั���ว�..."
 
-#: ../app/actions/edit-actions.c:162
+#: ../app/actions/edit-actions.c:179
+#, fuzzy
+#| msgid "Paste the content of the clipboard"
+msgctxt "edit-action"
+msgid "Paste the content of a named buffer"
+msgstr "��ะ��อมูล�า��ลิ��อร��"
+
+#: ../app/actions/edit-actions.c:184
+msgctxt "edit-action"
 msgid "Cl_ear"
 msgstr "ล_�ล�า�"
 
-#: ../app/actions/edit-actions.c:163
+#: ../app/actions/edit-actions.c:185
+#, fuzzy
+#| msgid "Clear the selected pixels"
+msgctxt "edit-action"
 msgid "Clear the selected pixels"
 msgstr "ล�ล�า��ิ���ล�ั��หม��ี��ลือ�"
 
-#: ../app/actions/edit-actions.c:171
+#: ../app/actions/edit-actions.c:193
+#, fuzzy
+#| msgid "Fill with _FG Color"
+msgctxt "edit-action"
 msgid "Fill with _FG Color"
 msgstr "��ิม��วยสี�ื��ห_��า"
 
-#: ../app/actions/edit-actions.c:172
+#: ../app/actions/edit-actions.c:194
+#, fuzzy
+#| msgid "Fill the selection using the foreground color"
+msgctxt "edit-action"
 msgid "Fill the selection using the foreground color"
 msgstr "��ิม�ื���ี��ลือ���วยสี�ื��ห��า"
 
-#: ../app/actions/edit-actions.c:177
+#: ../app/actions/edit-actions.c:199
+#, fuzzy
+#| msgid "Fill with B_G Color"
+msgctxt "edit-action"
 msgid "Fill with B_G Color"
 msgstr "��ิม��วยสี�ื��ห_ลั�"
 
-#: ../app/actions/edit-actions.c:178
+#: ../app/actions/edit-actions.c:200
+#, fuzzy
+#| msgid "Fill the selection using the background color"
+msgctxt "edit-action"
 msgid "Fill the selection using the background color"
 msgstr "��ิม�ื���ี��ลือ���วยสี�ื��หลั�"
 
-#: ../app/actions/edit-actions.c:183
-msgid "Fill with P_attern"
-msgstr "��ิม��วย�_��ลาย"
+#: ../app/actions/edit-actions.c:205
+#, fuzzy
+#| msgid "Fill with Pattern"
+msgctxt "edit-action"
+msgid "Fill _with Pattern"
+msgstr "��ิม��วย���ลาย"
 
-#: ../app/actions/edit-actions.c:184
+#: ../app/actions/edit-actions.c:206
+#, fuzzy
+#| msgid "Fill the selection using the active pattern"
+msgctxt "edit-action"
 msgid "Fill the selection using the active pattern"
 msgstr "��ิม�ื���ี��ลือ���วย���ลาย�ี��ลือ�อยู�"
 
-#: ../app/actions/edit-actions.c:261
+#: ../app/actions/edit-actions.c:295
 #, c-format
 msgid "_Undo %s"
-msgstr "�_ลั��ื� %s"
+msgstr "�รี_ย��ื� %s"
 
-#: ../app/actions/edit-actions.c:266
+#: ../app/actions/edit-actions.c:302
 #, c-format
 msgid "_Redo %s"
 msgstr "_�ำ��ำ %s"
 
-#: ../app/actions/edit-commands.c:132
+#: ../app/actions/edit-actions.c:317
+#, fuzzy, c-format
+msgid "_Fade %s..."
+msgstr "�ั��ึ_�����"
+
+#: ../app/actions/edit-actions.c:329
+msgid "_Undo"
+msgstr "�รี_ย��ื�"
+
+#: ../app/actions/edit-actions.c:330
+msgid "_Redo"
+msgstr "_�ำ��ำ"
+
+#: ../app/actions/edit-actions.c:331
+#, fuzzy
+#| msgid "_New..."
+msgid "_Fade..."
+msgstr "�_หม�..."
+
+#: ../app/actions/edit-commands.c:136
 msgid "Clear Undo History"
-msgstr "ล��ระวั�ิ�าร�ลั��ื�"
+msgstr "ล�า��ระวั�ิ�าร�รีย��ื�"
 
-#: ../app/actions/edit-commands.c:158
+#: ../app/actions/edit-commands.c:162
 msgid "Really clear image's undo history?"
-msgstr "ล�ราย�าร�ระวั�ิ�าร�ลั��ื��อ�ภา����หรือ�ม�?"
+msgstr "ล�า��ระวั�ิ�าร�รีย��ื��อ�ภา����หรือ�ม�?"
 
-#: ../app/actions/edit-commands.c:170
+#: ../app/actions/edit-commands.c:175
 #, c-format
 msgid "Clearing the undo history of this image will gain %s of memory."
-msgstr "�ารล�า��ระวั�ิราย�าร�ลั��ื��อ�ภา��ี��ะ�ำ�ห�มีห��วย�วาม�ำ��ิ�ม %s"
+msgstr "�ารล�า��ระวั�ิ�าร�รีย��ื��อ�ภา��ี��ะ�ำ�ห�มีห��วย�วาม�ำ��ิ�ม %s"
+
+#: ../app/actions/edit-commands.c:205
+#, fuzzy
+#| msgid "Copy the selected pixels to the clipboard"
+msgid "Cut pixels to the clipboard"
+msgstr "�ั�ลอ��ิ���ล�ี��ลือ��ั��หม���ยั��ลิ��อร��"
 
-#: ../app/actions/edit-commands.c:268 ../app/actions/edit-commands.c:422
+#: ../app/actions/edit-commands.c:235 ../app/actions/edit-commands.c:264
+#, fuzzy
+#| msgid "Copy the selected pixels to the clipboard"
+msgid "Copied pixels to the clipboard"
+msgstr "�ั�ลอ��ิ���ล�ี��ลือ��ั��หม���ยั��ลิ��อร��"
+
+#: ../app/actions/edit-commands.c:324 ../app/actions/edit-commands.c:359
+#: ../app/actions/edit-commands.c:538
 msgid "There is no image data in the clipboard to paste."
 msgstr ""
 
-#: ../app/actions/edit-commands.c:282
+#: ../app/actions/edit-commands.c:347 ../app/core/gimpbrushclipboard.c:180
+#: ../app/core/gimppatternclipboard.c:180 ../app/widgets/gimpclipboard.c:345
+msgid "Clipboard"
+msgstr "�ลิ��อร��"
+
+#: ../app/actions/edit-commands.c:373
 msgid "Cut Named"
 msgstr "�ั���ื�อส�ว��ี��ั�"
 
-#: ../app/actions/edit-commands.c:285 ../app/actions/edit-commands.c:305
-#: ../app/actions/edit-commands.c:325
+#: ../app/actions/edit-commands.c:376 ../app/actions/edit-commands.c:417
+#: ../app/actions/edit-commands.c:437
 msgid "Enter a name for this buffer"
 msgstr "��อ��ื�อ�หล���ั���อมูล�ี�"
 
-#: ../app/actions/edit-commands.c:302
+#: ../app/actions/edit-commands.c:414
 msgid "Copy Named"
 msgstr "�ั���ื�อส�ว��ี��ั�ลอ�"
 
-#: ../app/actions/edit-commands.c:322
+#: ../app/actions/edit-commands.c:434
 msgid "Copy Visible Named "
 msgstr "�ั���ื�อส�ว��ี��ั�ลอ����าะ�ี�มอ��ห��"
 
-#: ../app/actions/edit-commands.c:440
+#: ../app/actions/edit-commands.c:555
 msgid "There is no active layer or channel to cut from."
 msgstr "�ม�มี�ั���า�หรือ�����ล�ี��ำลั��ำ�า�อยู��ห��ั�ออ�มา"
 
-#: ../app/actions/edit-commands.c:445 ../app/actions/edit-commands.c:471
-#: ../app/actions/edit-commands.c:488
+#: ../app/actions/edit-commands.c:560 ../app/actions/edit-commands.c:592
+#: ../app/actions/edit-commands.c:616
 msgid "(Unnamed Buffer)"
 msgstr "(�หล���ั���อมูล�ม�����ั���ื�อ)"
 
-#: ../app/actions/edit-commands.c:466
+#: ../app/actions/edit-commands.c:587
 msgid "There is no active layer or channel to copy from."
 msgstr "�ม�มี�ั���า�หรือ�����ล�ี��ำ�า�อยู��ห��ั�ลอ�"
 
-#: ../app/actions/error-console-actions.c:40
+#: ../app/actions/error-console-actions.c:39
+#, fuzzy
+#| msgid "Error Console Menu"
+msgctxt "error-console-action"
 msgid "Error Console Menu"
 msgstr "�ม�ูห��า��า��ส����อ�ิ��ลา�"
 
-#: ../app/actions/error-console-actions.c:44
+#: ../app/actions/error-console-actions.c:43
+msgctxt "error-console-action"
 msgid "_Clear"
-msgstr "_ล�ล�า�"
+msgstr "_ล�า�"
 
-#: ../app/actions/error-console-actions.c:45
+#: ../app/actions/error-console-actions.c:44
+msgctxt "error-console-action"
 msgid "Clear error console"
-msgstr "ล�ล�า�ห��า��า��ส����อ�ิ��ลา�"
+msgstr "ล�า�ห��า��า��ส����อ�ิ��ลา�"
 
-#: ../app/actions/error-console-actions.c:50
+#: ../app/actions/error-console-actions.c:49
+msgctxt "error-console-action"
 msgid "Select _All"
 msgstr "�ลือ�_�ั��หม�"
 
-#: ../app/actions/error-console-actions.c:51
-msgid "Select all errors"
+#: ../app/actions/error-console-actions.c:50
+#, fuzzy
+#| msgid "Select all errors"
+msgctxt "error-console-action"
+msgid "Select all error messages"
 msgstr "�ลือ���อ�ิ��ลา��ั��หม�"
 
-#: ../app/actions/error-console-actions.c:59
+#: ../app/actions/error-console-actions.c:58
+#, fuzzy
+#| msgid "_Save Error Log to File..."
+msgctxt "error-console-action"
 msgid "_Save Error Log to File..."
 msgstr "_�ั��ึ��ูม��อ�ิ��ลา�ล����ม..."
 
-#: ../app/actions/error-console-actions.c:60
-msgid "Save error log"
-msgstr "�ั��ึ��ูม��อ�ิ��ลา�"
+#: ../app/actions/error-console-actions.c:59
+msgctxt "error-console-action"
+msgid "Write all error messages to a file"
+msgstr ""
 
-#: ../app/actions/error-console-actions.c:65
+#: ../app/actions/error-console-actions.c:64
+#, fuzzy
+#| msgid "Save S_election to File..."
+msgctxt "error-console-action"
 msgid "Save S_election to File..."
 msgstr "�ั��ึ�_���าะ�ี��ลือ�ล����ม..."
 
-#: ../app/actions/error-console-actions.c:66
-msgid "Save selection"
-msgstr "�ั��ึ����าะส�ว��ี��ลือ��ลือ�"
+#: ../app/actions/error-console-actions.c:65
+#, fuzzy
+#| msgid "Paste the selected buffer as new image"
+msgctxt "error-console-action"
+msgid "Write the selected error messages to a file"
+msgstr "��ะ��อมูล�า��ุ��ั���อมูล�ี��ลือ��ว�����ภา��หม�"
 
-#: ../app/actions/error-console-commands.c:82
+#: ../app/actions/error-console-commands.c:84
 msgid "Cannot save. Nothing is selected."
 msgstr "�ม�มี�าร�ลือ� �ม�สามาร��ั��ึ����"
 
-#: ../app/actions/error-console-commands.c:93
+#: ../app/actions/error-console-commands.c:95
 msgid "Save Error Log to File"
 msgstr "�ั��ึ��ูม��อ�ิ��ลา�ล����ม"
 
-#: ../app/actions/error-console-commands.c:151
+#: ../app/actions/error-console-commands.c:157
 #, c-format
 msgid ""
 "Error writing file '%s':\n"
@@ -1595,137 +2541,243 @@ msgstr ""
 "��ิ���อ�ิ��ลา����าร��ีย����ม '%s':\n"
 "%s"
 
-#: ../app/actions/file-actions.c:64
+#: ../app/actions/file-actions.c:71
+msgctxt "file-action"
 msgid "_File"
 msgstr "�_��ม"
 
-#: ../app/actions/file-actions.c:65
+#: ../app/actions/file-actions.c:72
+msgctxt "file-action"
+msgid "Crea_te"
+msgstr ""
+
+#: ../app/actions/file-actions.c:73
+#, fuzzy
+#| msgid "Open _Recent"
+msgctxt "file-action"
 msgid "Open _Recent"
 msgstr "��ิ��า��ี��_�ย��ิ�"
 
-#: ../app/actions/file-actions.c:66
-msgid "Acq_uire"
-msgstr "_รั����ามา"
-
-#: ../app/actions/file-actions.c:69 ../app/actions/file-actions.c:74
+#: ../app/actions/file-actions.c:76
+msgctxt "file-action"
 msgid "_Open..."
-msgstr "�_�ิ�..."
+msgstr "_��ิ�..."
 
-#: ../app/actions/file-actions.c:79
-msgid "Op_en as Layer..."
+#: ../app/actions/file-actions.c:77
+msgctxt "file-action"
+msgid "Open an image file"
+msgstr "��ิ����มภา�"
+
+#: ../app/actions/file-actions.c:82
+msgctxt "file-action"
+msgid "Op_en as Layers..."
 msgstr "��ิ�����_�ั���า�..."
 
-#: ../app/actions/file-actions.c:84
+#: ../app/actions/file-actions.c:83
+msgctxt "file-action"
+msgid "Open an image file as layers"
+msgstr "��ิ�ภา����า�����ั���า�"
+
+#: ../app/actions/file-actions.c:88
+msgctxt "file-action"
 msgid "Open _Location..."
 msgstr "��ิ�_�ำ�ห���..."
 
 #: ../app/actions/file-actions.c:89
-msgid "_Save"
-msgstr "_�ั��ึ�"
+msgctxt "file-action"
+msgid "Open an image file from a specified location"
+msgstr ""
 
 #: ../app/actions/file-actions.c:94
-#, fuzzy
-msgid "Save _As..."
-msgstr "�ั��ึ_�����"
-
-#: ../app/actions/file-actions.c:99
-msgid "Save a Cop_y..."
-msgstr "�ั��ึ�สำ�_�า..."
-
-#: ../app/actions/file-actions.c:104
-msgid "Save as _Template..."
-msgstr "�ั��ึ������_ม����..."
+msgctxt "file-action"
+msgid "Create Template..."
+msgstr "สร�า��ม����..."
 
-#: ../app/actions/file-actions.c:105
+#: ../app/actions/file-actions.c:95
+#, fuzzy
+#| msgid "Create a new template from this image"
+msgctxt "file-action"
 msgid "Create a new template from this image"
 msgstr "สร�า��ม�����หม���วยภา��ี�"
 
-#: ../app/actions/file-actions.c:110
+#: ../app/actions/file-actions.c:100
+msgctxt "file-action"
 msgid "Re_vert"
-msgstr "ย�อ��ลั�"
+msgstr "�ื�_�ลั�"
 
-#: ../app/actions/file-actions.c:111
+#: ../app/actions/file-actions.c:101
+#, fuzzy
+#| msgid "Reload the image file from disk"
+msgctxt "file-action"
 msgid "Reload the image file from disk"
 msgstr "�หล����มภา�อี��รั���า��ิส��"
 
-#: ../app/actions/file-actions.c:116
+#: ../app/actions/file-actions.c:106
+msgctxt "file-action"
 msgid "Close all"
 msgstr "�ิ��ั��หม�"
 
-#: ../app/actions/file-actions.c:117
+#: ../app/actions/file-actions.c:107
+#, fuzzy
+#| msgid "Close all opened images"
+msgctxt "file-action"
 msgid "Close all opened images"
 msgstr "�ิ�ภา��ุ�ภา��ี��ำลั���ิ�อยู�����ะ�ี�"
 
-#: ../app/actions/file-actions.c:122
+#: ../app/actions/file-actions.c:112
+msgctxt "file-action"
 msgid "_Quit"
-msgstr "_�ลิ��าร�ำ�า�"
+msgstr "_ออ�"
 
-#: ../app/actions/file-actions.c:123
+#: ../app/actions/file-actions.c:113
+msgctxt "file-action"
 msgid "Quit the GNU Image Manipulation Program"
 msgstr "ออ��า� GNU Image Manipulation Program"
 
-#: ../app/actions/file-commands.c:242 ../app/dialogs/file-save-dialog.c:508
-#: ../app/widgets/gimpdnd-xds.c:173
+#: ../app/actions/file-actions.c:121
+msgctxt "file-action"
+msgid "_Save"
+msgstr "_�ั��ึ�"
+
+#: ../app/actions/file-actions.c:122
+msgctxt "file-action"
+msgid "Save this image"
+msgstr "�ั��ึ�ภา��ี�"
+
+#: ../app/actions/file-actions.c:127
+msgctxt "file-action"
+msgid "Save _As..."
+msgstr "�ั��ึ����_�..."
+
+#: ../app/actions/file-actions.c:128
+msgctxt "file-action"
+msgid "Save this image with a different name"
+msgstr ""
+
+#: ../app/actions/file-actions.c:133
+msgctxt "file-action"
+msgid "Save a Cop_y..."
+msgstr "�ั��ึ�_สำ��า..."
+
+#: ../app/actions/file-actions.c:135
+msgctxt "file-action"
+msgid "Save this image with a different name, but keep its current name"
+msgstr ""
+
+#: ../app/actions/file-actions.c:140
+msgctxt "file-action"
+msgid "Save and Close..."
+msgstr "�ั��ึ��ละ�ิ�..."
+
+#: ../app/actions/file-actions.c:141
+#, fuzzy
+msgctxt "file-action"
+msgid "Save this image and close its window"
+msgstr "ภา����มห��า��า�"
+
+#: ../app/actions/file-actions.c:146
+#, fuzzy
+#| msgid "E_xport Path..."
+msgctxt "file-action"
+msgid "Export to"
+msgstr "ส�_�ออ��ส���า�..."
+
+#: ../app/actions/file-actions.c:147
+#, fuzzy
+#| msgid "Export the active path"
+msgctxt "file-action"
+msgid "Export the image again"
+msgstr "ส��ออ���อมูล�ส���า��ี��ลือ�อยู�"
+
+#: ../app/actions/file-actions.c:152
+msgctxt "file-action"
+msgid "Overwrite"
+msgstr ""
+
+#: ../app/actions/file-actions.c:153
+msgctxt "file-action"
+msgid "Export the image back to the imported file in the import format"
+msgstr ""
+
+#: ../app/actions/file-actions.c:158
+msgctxt "file-action"
+msgid "Export..."
+msgstr "ส��ออ�..."
+
+#: ../app/actions/file-actions.c:159
+msgctxt "file-action"
+msgid "Export the image to various file formats such as PNG or JPEG"
+msgstr ""
+
+#: ../app/actions/file-actions.c:292
 #, c-format
-msgid ""
-"Saving '%s' failed:\n"
-"\n"
-"%s"
+msgid "Export to %s"
+msgstr "ส��ออ���ยั� %s"
+
+#: ../app/actions/file-actions.c:298
+#, c-format
+msgid "Overwrite %s"
 msgstr ""
-"�าร�ั��ึ� '%s' ล�ม�หลว:\n"
-"\n"
-"%s"
 
-#: ../app/actions/file-commands.c:273 ../app/dialogs/file-save-dialog.c:82
+#: ../app/actions/file-actions.c:306
+msgid "Export to"
+msgstr "ส��ออ���ยั�"
+
+#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:475
+#: ../app/dialogs/file-open-dialog.c:77
+msgid "Open Image"
+msgstr "��ิ�ภา�"
+
+#: ../app/actions/file-commands.c:133
+msgid "Open Image as Layers"
+msgstr "��ิ�ภา����า�����ั���า�"
+
+#: ../app/actions/file-commands.c:265
+msgid "No changes need to be saved"
+msgstr ""
+
+#: ../app/actions/file-commands.c:272 ../app/dialogs/file-save-dialog.c:95
 msgid "Save Image"
 msgstr "�ั��ึ�ภา�"
 
-#: ../app/actions/file-commands.c:289
+#: ../app/actions/file-commands.c:278
 msgid "Save a Copy of the Image"
 msgstr "�ั��ึ�สำ��า�อ�ภา�"
 
-#: ../app/actions/file-commands.c:300
+#: ../app/actions/file-commands.c:338
 msgid "Create New Template"
 msgstr "สร�า��ม�����หม�"
 
-#: ../app/actions/file-commands.c:304
+#: ../app/actions/file-commands.c:342
 msgid "Enter a name for this template"
 msgstr "�ั���ื�อ�ม�����ี�"
 
-#: ../app/actions/file-commands.c:330
+#: ../app/actions/file-commands.c:377
 msgid "Revert failed. No file name associated with this image."
 msgstr "�ารย�อ��ลั�ภา�ล�ม�หลว �ม����ื�อ���ม���ี�สัม�ั����ั�ภา��ี�"
 
-#: ../app/actions/file-commands.c:343
+#: ../app/actions/file-commands.c:390
 msgid "Revert Image"
 msgstr "ย�อ��ลั�����ภา��ั����ิม"
 
-#: ../app/actions/file-commands.c:369
+#: ../app/actions/file-commands.c:421
 #, c-format
 msgid "Revert '%s' to '%s'?"
 msgstr "ย�อ��ลั� '%s' สู� '%s'?"
 
-#: ../app/actions/file-commands.c:375
+#: ../app/actions/file-commands.c:427
 msgid ""
 "By reverting the image to the state saved on disk, you will lose all "
 "changes, including all undo information."
 msgstr ""
 "��วย�าร�ื�ภา�สู�ส�า�ะ�ี��ั��ึ����ิส��ล�าสุ� ��อมูล�ี�����ำหรือ��ลี�ย���ล��ะหาย�ั��หม� "
-"รวม�ั����อมูล�าร�ลั��ื��าร�ระ�ำ��วย"
+"รวม�ั����อมูล�าร�รีย��ื��าร�ระ�ำ��วย"
 
-#: ../app/actions/file-commands.c:447
-msgid "Open Image as Layer"
-msgstr "��ิ�ภา����า�����ั���า�"
-
-#: ../app/actions/file-commands.c:452 ../app/dialogs/file-open-dialog.c:74
-msgid "Open Image"
-msgstr "��ิ�ภา�"
-
-#: ../app/actions/file-commands.c:523
+#: ../app/actions/file-commands.c:638
 msgid "(Unnamed Template)"
 msgstr "(�ม����ยั��ม��ั���ื�อ)"
 
-#: ../app/actions/file-commands.c:571
+#: ../app/actions/file-commands.c:690
 #, c-format
 msgid ""
 "Reverting to '%s' failed:\n"
@@ -1736,298 +2788,376 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/actions/fonts-actions.c:44
+#: ../app/actions/fonts-actions.c:43
+msgctxt "fonts-action"
 msgid "Fonts Menu"
 msgstr "�ม�ู���อั�ษร"
 
-#: ../app/actions/fonts-actions.c:48
+#: ../app/actions/fonts-actions.c:47
+#, fuzzy
+#| msgid "_Rescan Font List"
+msgctxt "fonts-action"
 msgid "_Rescan Font List"
 msgstr "_�รว�หาราย�าร���อั�ษร�หม�อี��รั��"
 
-#: ../app/actions/fonts-actions.c:49
-msgid "Rescan font list"
-msgstr "�รว�หาราย�าร���อั�ษร�หม�อี��รั��"
+#: ../app/actions/fonts-actions.c:48
+msgctxt "fonts-action"
+msgid "Rescan the installed fonts"
+msgstr ""
 
-#: ../app/actions/gradient-editor-actions.c:46
+#: ../app/actions/gradient-editor-actions.c:45
+#, fuzzy
+#| msgid "Gradient Editor Menu"
+msgctxt "gradient-editor-action"
 msgid "Gradient Editor Menu"
-msgstr "�ม�ู�ัว�����สี�ร��า"
+msgstr "�ม�ู��รื�อ�มือ�����สี�ร��า"
 
-#: ../app/actions/gradient-editor-actions.c:50
+#: ../app/actions/gradient-editor-actions.c:49
 #, fuzzy
+msgctxt "gradient-editor-action"
 msgid "Left Color Type"
 msgstr "�ั��ึ_�สี��า���าย���ี�"
 
-#: ../app/actions/gradient-editor-actions.c:52
+#: ../app/actions/gradient-editor-actions.c:51
+#, fuzzy
+#| msgid "_Load Left Color From"
+msgctxt "gradient-editor-action"
 msgid "_Load Left Color From"
 msgstr "�หล�สี��า���า_ย�า�"
 
-#: ../app/actions/gradient-editor-actions.c:54
+#: ../app/actions/gradient-editor-actions.c:53
+#, fuzzy
+#| msgid "_Save Left Color To"
+msgctxt "gradient-editor-action"
 msgid "_Save Left Color To"
 msgstr "�ั��ึ_�สี��า���าย���ี�"
 
-#: ../app/actions/gradient-editor-actions.c:57
+#: ../app/actions/gradient-editor-actions.c:56
 #, fuzzy
+msgctxt "gradient-editor-action"
 msgid "Right Color Type"
 msgstr "�ั�_�ึ�สี��า��วา���ี�"
 
-#: ../app/actions/gradient-editor-actions.c:59
+#: ../app/actions/gradient-editor-actions.c:58
+#, fuzzy
+#| msgid "Load Right Color Fr_om"
+msgctxt "gradient-editor-action"
 msgid "Load Right Color Fr_om"
 msgstr "�หล�สี��า�_�วา�า�"
 
-#: ../app/actions/gradient-editor-actions.c:61
+#: ../app/actions/gradient-editor-actions.c:60
+#, fuzzy
+#| msgid "Sa_ve Right Color To"
+msgctxt "gradient-editor-action"
 msgid "Sa_ve Right Color To"
 msgstr "�ั�_�ึ�สี��า��วา���ี�"
 
-#: ../app/actions/gradient-editor-actions.c:67
+#: ../app/actions/gradient-editor-actions.c:66
+#, fuzzy
+#| msgid "L_eft Endpoint's Color..."
+msgctxt "gradient-editor-action"
 msgid "L_eft Endpoint's Color..."
 msgstr "สี��า���า_ยสุ�..."
 
-#: ../app/actions/gradient-editor-actions.c:72
+#: ../app/actions/gradient-editor-actions.c:71
+#, fuzzy
+#| msgid "R_ight Endpoint's Color..."
+msgctxt "gradient-editor-action"
 msgid "R_ight Endpoint's Color..."
 msgstr "สี��า�_�วาสุ�..."
 
-#: ../app/actions/gradient-editor-actions.c:112
+#: ../app/actions/gradient-editor-actions.c:111
+#, fuzzy
+#| msgid "Ble_nd Endpoints' Colors"
+msgctxt "gradient-editor-action"
 msgid "Ble_nd Endpoints' Colors"
-msgstr "�สา�สีระหว�า��ลายสุ��ั��สอ��หม�"
+msgstr "�ลื�สีระหว�า��ลายสุ��ั��สอ��หม�"
 
-#: ../app/actions/gradient-editor-actions.c:117
+#: ../app/actions/gradient-editor-actions.c:116
+#, fuzzy
+#| msgid "Blend Endpoints' Opacit_y"
+msgctxt "gradient-editor-action"
 msgid "Blend Endpoints' Opacit_y"
-msgstr "�สา��วาม�ึ��ี��ลายสุ��ั��สอ��หม�"
+msgstr "�ลื��วาม�ึ��ี��ลายสุ��ั��สอ��หม�"
 
-#: ../app/actions/gradient-editor-actions.c:125
+#: ../app/actions/gradient-editor-actions.c:124
+#, fuzzy
+#| msgid "Edit Active Gradient"
+msgctxt "gradient-editor-action"
 msgid "Edit Active Gradient"
 msgstr "�����สี�ร��า�ี��ำลั��ู����"
 
-#: ../app/actions/gradient-editor-actions.c:156
+#: ../app/actions/gradient-editor-actions.c:155
+#, fuzzy
+#| msgid "_Left Neighbor's Right Endpoint"
+msgctxt "gradient-editor-action"
 msgid "_Left Neighbor's Right Endpoint"
 msgstr "�อ���า��วา�อ��ื���ี��ี��ิ��ั��า���าย"
 
-#: ../app/actions/gradient-editor-actions.c:161
+#: ../app/actions/gradient-editor-actions.c:160
+#, fuzzy
+#| msgid "_Right Endpoint"
+msgctxt "gradient-editor-action"
 msgid "_Right Endpoint"
 msgstr "�อ���า�_�วาสุ�"
 
-#: ../app/actions/gradient-editor-actions.c:166
-#: ../app/actions/gradient-editor-actions.c:214
+#: ../app/actions/gradient-editor-actions.c:165
+#: ../app/actions/gradient-editor-actions.c:213
+#, fuzzy
+#| msgid "_Foreground Color"
+msgctxt "gradient-editor-action"
 msgid "_Foreground Color"
-msgstr "สี�ื��_ห��า"
+msgstr "สี�ื��ห_��า"
 
-#: ../app/actions/gradient-editor-actions.c:171
-#: ../app/actions/gradient-editor-actions.c:219
-#: ../app/actions/gradient-editor-actions.c:273
-#: ../app/actions/gradient-editor-actions.c:301
+#: ../app/actions/gradient-editor-actions.c:170
+#: ../app/actions/gradient-editor-actions.c:218
+msgctxt "gradient-editor-action"
 msgid "_Background Color"
 msgstr "สี�ื��ห_ลั�"
 
-#: ../app/actions/gradient-editor-actions.c:204
+#: ../app/actions/gradient-editor-actions.c:203
+#, fuzzy
+#| msgid "_Right Neighbor's Left Endpoint"
+msgctxt "gradient-editor-action"
 msgid "_Right Neighbor's Left Endpoint"
 msgstr "�อ���า���าย�อ��ื���ี��ี��ิ��ั��า��วา"
 
-#: ../app/actions/gradient-editor-actions.c:209
+#: ../app/actions/gradient-editor-actions.c:208
+#, fuzzy
+#| msgid "_Left Endpoint"
+msgctxt "gradient-editor-action"
 msgid "_Left Endpoint"
 msgstr "�อ���า�_��ายสุ�"
 
-#: ../app/actions/gradient-editor-actions.c:258
-#: ../app/actions/gradient-editor-actions.c:286
+#: ../app/actions/gradient-editor-actions.c:257
+#: ../app/actions/gradient-editor-actions.c:287
 #, fuzzy
+msgctxt "gradient-editor-color-type"
 msgid "_Fixed"
 msgstr "���ม"
 
-#: ../app/actions/gradient-editor-actions.c:263
-#: ../app/actions/gradient-editor-actions.c:291
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:262
+#: ../app/actions/gradient-editor-actions.c:292
+msgctxt "gradient-editor-color-type"
 msgid "F_oreground Color"
 msgstr "สี�ื��_ห��า"
 
 #: ../app/actions/gradient-editor-actions.c:268
-#: ../app/actions/gradient-editor-actions.c:296
+#: ../app/actions/gradient-editor-actions.c:298
 #, fuzzy
+msgctxt "gradient-editor-color-type"
 msgid "Fo_reground Color (Transparent)"
 msgstr "�ุ�สี�ื��ห��า����:"
 
-#: ../app/actions/gradient-editor-actions.c:278
-#: ../app/actions/gradient-editor-actions.c:306
+#: ../app/actions/gradient-editor-actions.c:273
+#: ../app/actions/gradient-editor-actions.c:303
+msgctxt "gradient-editor-color-type"
+msgid "_Background Color"
+msgstr "สี�ื��ห_ลั�"
+
+#: ../app/actions/gradient-editor-actions.c:279
+#: ../app/actions/gradient-editor-actions.c:309
 #, fuzzy
+msgctxt "gradient-editor-color-type"
 msgid "B_ackground Color (Transparent)"
 msgstr "�ุ�สี�ื��หลั�����:"
 
-#: ../app/actions/gradient-editor-actions.c:314
+#: ../app/actions/gradient-editor-actions.c:317
+#, fuzzy
+#| msgid "_Linear"
+msgctxt "gradient-editor-blending"
 msgid "_Linear"
 msgstr "สม�ำ�สมอ�����ิ��_ส��"
 
-#: ../app/actions/gradient-editor-actions.c:319
+#: ../app/actions/gradient-editor-actions.c:322
+#, fuzzy
+#| msgid "_Curved"
+msgctxt "gradient-editor-blending"
 msgid "_Curved"
 msgstr "�ิ��_���"
 
-#: ../app/actions/gradient-editor-actions.c:324
+#: ../app/actions/gradient-editor-actions.c:327
+#, fuzzy
+#| msgid "_Sinusoidal"
+msgctxt "gradient-editor-blending"
 msgid "_Sinusoidal"
 msgstr "�ิ���������_���"
 
-#: ../app/actions/gradient-editor-actions.c:329
+#: ../app/actions/gradient-editor-actions.c:332
+#, fuzzy
+#| msgid "Spherical (i_ncreasing)"
+msgctxt "gradient-editor-blending"
 msgid "Spherical (i_ncreasing)"
 msgstr "�����ร��ลม (�_�ิ�ม�ึ��)"
 
-#: ../app/actions/gradient-editor-actions.c:334
+#: ../app/actions/gradient-editor-actions.c:337
+#, fuzzy
+#| msgid "Spherical (_decreasing)"
+msgctxt "gradient-editor-blending"
 msgid "Spherical (_decreasing)"
 msgstr "�����ร��ลม (_ล�ล�)"
 
-#: ../app/actions/gradient-editor-actions.c:339
-#: ../app/actions/gradient-editor-actions.c:362
+#: ../app/actions/gradient-editor-actions.c:342
+msgctxt "gradient-editor-blending"
 msgid "(Varies)"
 msgstr "(หลา�หลาย)"
 
-#: ../app/actions/gradient-editor-actions.c:347
-#: ../app/actions/image-actions.c:147
+#: ../app/actions/gradient-editor-actions.c:350
+msgctxt "gradient-editor-coloring"
 msgid "_RGB"
 msgstr "_RGB"
 
-#: ../app/actions/gradient-editor-actions.c:352
+#: ../app/actions/gradient-editor-actions.c:355
+msgctxt "gradient-editor-coloring"
 msgid "HSV (_counter-clockwise hue)"
-msgstr "HSV (hue _�ว����ม�าฬิ�า)"
+msgstr "HSV (�า�ุสี_�ว����ม�าฬิ�า)"
 
-#: ../app/actions/gradient-editor-actions.c:357
+#: ../app/actions/gradient-editor-actions.c:360
+msgctxt "gradient-editor-coloring"
 msgid "HSV (clockwise _hue)"
-msgstr "HSV (hue _�าม���ม�าฬิ�า)"
+msgstr "HSV (�า�ุสี_�าม���ม�าฬิ�า)"
+
+#: ../app/actions/gradient-editor-actions.c:365
+msgctxt "gradient-editor-coloring"
+msgid "(Varies)"
+msgstr "(หลา�หลาย)"
 
-#: ../app/actions/gradient-editor-actions.c:370
+#: ../app/actions/gradient-editor-actions.c:373
 msgid "Zoom In"
 msgstr "�ูม���า"
 
-#: ../app/actions/gradient-editor-actions.c:371
-#: ../app/actions/palette-editor-actions.c:88
-#: ../app/actions/view-actions.c:243 ../app/actions/view-actions.c:254
-#: ../app/actions/view-actions.c:255
+#: ../app/actions/gradient-editor-actions.c:374
+#: ../app/actions/palette-editor-actions.c:89
 msgid "Zoom in"
 msgstr "�ูม���า"
 
-#: ../app/actions/gradient-editor-actions.c:376
-#: ../app/actions/view-actions.c:248
+#: ../app/actions/gradient-editor-actions.c:379
 msgid "Zoom Out"
 msgstr "�ูมออ�"
 
-#: ../app/actions/gradient-editor-actions.c:377
-#: ../app/actions/palette-editor-actions.c:94
-#: ../app/actions/view-actions.c:237 ../app/actions/view-actions.c:249
+#: ../app/actions/gradient-editor-actions.c:380
+#: ../app/actions/palette-editor-actions.c:95
 msgid "Zoom out"
 msgstr "�ูมออ�"
 
-#: ../app/actions/gradient-editor-actions.c:382
+#: ../app/actions/gradient-editor-actions.c:385
 msgid "Zoom All"
 msgstr "�ส���ั��หม�"
 
-#: ../app/actions/gradient-editor-actions.c:383
-#: ../app/actions/palette-editor-actions.c:100
+#: ../app/actions/gradient-editor-actions.c:386
+#: ../app/actions/palette-editor-actions.c:101
 msgid "Zoom all"
 msgstr "�ส���ั��หม�"
 
-#: ../app/actions/gradient-editor-actions.c:773
+#: ../app/actions/gradient-editor-actions.c:776
 msgid "_Blending Function for Segment"
-msgstr "_�ั����ั��าร�สา�สีสำหรั�ส�ว��ี�"
+msgstr "_�ั����ั��าร�ลื�สีสำหรั�ส�ว�ย�อย"
 
-#: ../app/actions/gradient-editor-actions.c:775
+#: ../app/actions/gradient-editor-actions.c:778
 msgid "Coloring _Type for Segment"
-msgstr "_��ิ��าร�ล�สีสำหรั�ส�ว��ี�"
+msgstr "_��ิ��าร�ล�สีสำหรั�ส�ว�ย�อย"
 
-#: ../app/actions/gradient-editor-actions.c:778
+#: ../app/actions/gradient-editor-actions.c:781
 msgid "_Flip Segment"
-msgstr "_�ลั���า�ส�ว�"
+msgstr "_�ลิ�ส�ว�ย�อย"
 
-#: ../app/actions/gradient-editor-actions.c:780
+#: ../app/actions/gradient-editor-actions.c:783
 msgid "_Replicate Segment..."
-msgstr "����ส�ว�ย�อย�ล�ว_�ำ��ำ..."
+msgstr "_�ำ��ำส�ว�ย�อย..."
 
-#: ../app/actions/gradient-editor-actions.c:782
+#: ../app/actions/gradient-editor-actions.c:785
 msgid "Split Segment at _Midpoint"
 msgstr "����ส�ว�ย�อย�ี��ุ�_�ลา�"
 
-#: ../app/actions/gradient-editor-actions.c:784
+#: ../app/actions/gradient-editor-actions.c:787
 msgid "Split Segment _Uniformly..."
 msgstr "����ส�ว�ย�อย���_��อ��ื�อ�..."
 
-#: ../app/actions/gradient-editor-actions.c:786
+#: ../app/actions/gradient-editor-actions.c:789
 msgid "_Delete Segment"
-msgstr "_ล�ส�ว�"
+msgstr "_ล�ส�ว�ย�อย"
 
-#: ../app/actions/gradient-editor-actions.c:788
+#: ../app/actions/gradient-editor-actions.c:791
 msgid "Re-_center Segment's Midpoint"
 msgstr "ย�าย�ุ��ลา��ห��ลั�มาอยู��ึ���ลา�"
 
-#: ../app/actions/gradient-editor-actions.c:790
+#: ../app/actions/gradient-editor-actions.c:793
 msgid "Re-distribute _Handles in Segment"
 msgstr "�ระ�าย�ุ�����ส�ว��หม��ห����า� �ั�"
 
-#: ../app/actions/gradient-editor-actions.c:795
+#: ../app/actions/gradient-editor-actions.c:798
 msgid "_Blending Function for Selection"
-msgstr "�ั����ั��าร_�สา�สีสำหรั�ส�ว��ี��ลือ�"
+msgstr "�ั����ั��าร_�ลื�สีสำหรั�ส�ว��ี��ลือ�"
 
-#: ../app/actions/gradient-editor-actions.c:797
+#: ../app/actions/gradient-editor-actions.c:800
 msgid "Coloring _Type for Selection"
 msgstr "��ิ��าร�ล�สีสำหรั�ส�ว��ี��ลือ�"
 
-#: ../app/actions/gradient-editor-actions.c:800
+#: ../app/actions/gradient-editor-actions.c:803
 msgid "_Flip Selection"
-msgstr "�_ลั���า�ส�ว��ี��ลือ�"
+msgstr "_�ลิ�ส�ว��ี��ลือ�"
 
-#: ../app/actions/gradient-editor-actions.c:802
+#: ../app/actions/gradient-editor-actions.c:805
 msgid "_Replicate Selection..."
-msgstr "����ย�อยส�ว��ี��ลือ��ละ_�ำ��ำ..."
+msgstr "_�ำ��ำส�ว��ี��ลือ�..."
 
-#: ../app/actions/gradient-editor-actions.c:804
+#: ../app/actions/gradient-editor-actions.c:807
 msgid "Split Segments at _Midpoints"
 msgstr "����ส�ว�ย�อย�ี��ุ�_�ลา��อ��ุ�� ส�ว��ี��ลือ�"
 
-#: ../app/actions/gradient-editor-actions.c:806
+#: ../app/actions/gradient-editor-actions.c:809
 msgid "Split Segments _Uniformly..."
 msgstr "����ส�ว�ย�อย�ุ�ส�ว��ี��ลือ����_��อ��ื�อ�..."
 
-#: ../app/actions/gradient-editor-actions.c:808
+#: ../app/actions/gradient-editor-actions.c:811
 msgid "_Delete Selection"
-msgstr "_ล�ส�ว��ี��ลือ��ั��หม�"
+msgstr "_ล�ส�ว��ี��ลือ�"
 
-#: ../app/actions/gradient-editor-actions.c:810
+#: ../app/actions/gradient-editor-actions.c:813
 msgid "Re-_center Midpoints in Selection"
 msgstr "ย�าย_�ุ��ลา���ส�ว��ี��ลือ��ุ�ส�ว��ห��ลั�มาอยู��ึ���ลา�"
 
-#: ../app/actions/gradient-editor-actions.c:812
+#: ../app/actions/gradient-editor-actions.c:815
 msgid "Re-distribute _Handles in Selection"
 msgstr "�ระ�าย�ุ�����ส�ว��หม��ห����า� �ั��ุ�ส�ว��ี��ลือ�"
 
-#: ../app/actions/gradient-editor-commands.c:86
+#: ../app/actions/gradient-editor-commands.c:84
 msgid "Left Endpoint Color"
 msgstr "สี��า���ายสุ�"
 
-#: ../app/actions/gradient-editor-commands.c:88
+#: ../app/actions/gradient-editor-commands.c:86
 msgid "Gradient Segment's Left Endpoint Color"
 msgstr "สี��า���ายสุ��อ�ส�ว��อ�สี�ร��า"
 
-#: ../app/actions/gradient-editor-commands.c:237
+#: ../app/actions/gradient-editor-commands.c:235
 msgid "Right Endpoint Color"
 msgstr "สี��า��วาสุ�"
 
-#: ../app/actions/gradient-editor-commands.c:239
+#: ../app/actions/gradient-editor-commands.c:237
 msgid "Gradient Segment's Right Endpoint Color"
 msgstr "สี��า��วาสุ��อ�ส�ว��อ�สี�ร��า"
 
-#: ../app/actions/gradient-editor-commands.c:453
+#: ../app/actions/gradient-editor-commands.c:451
 msgid "Replicate Segment"
 msgstr "�ำ��ำส�ว�ย�อย"
 
-#: ../app/actions/gradient-editor-commands.c:454
+#: ../app/actions/gradient-editor-commands.c:452
 msgid "Replicate Gradient Segment"
 msgstr "�ำ��ำส�ว�ย�อยสี�ร��า"
 
-#: ../app/actions/gradient-editor-commands.c:458
+#: ../app/actions/gradient-editor-commands.c:456
 msgid "Replicate Selection"
 msgstr "�ำ��ำส�ว��ี��ลือ�"
 
-#: ../app/actions/gradient-editor-commands.c:459
+#: ../app/actions/gradient-editor-commands.c:457
 msgid "Replicate Gradient Selection"
-msgstr "�ำ��ำส�ว��ี��ลือ�สี�ร��า"
+msgstr "�ำ��ำส�ว��ี��ลือ�����ร��า"
 
-#: ../app/actions/gradient-editor-commands.c:472
+#: ../app/actions/gradient-editor-commands.c:470
 msgid "Replicate"
 msgstr "�ำ��ำ"
 
-#: ../app/actions/gradient-editor-commands.c:492
+#: ../app/actions/gradient-editor-commands.c:491
 msgid ""
 "Select the number of times\n"
 "to replicate the selected segment."
@@ -2035,7 +3165,7 @@ msgstr ""
 "�ลือ�า�ำ�ว��รั��\n"
 "�ี��ะ�ำ��ำส�ว��ี��ลือ�"
 
-#: ../app/actions/gradient-editor-commands.c:495
+#: ../app/actions/gradient-editor-commands.c:494
 msgid ""
 "Select the number of times\n"
 "to replicate the selection."
@@ -2043,23 +3173,23 @@ msgstr ""
 "�ลือ��ำ�ว��รั��\n"
 "�ี��ะ�ำ��ำ�าร�ลือ��ั��หม�"
 
-#: ../app/actions/gradient-editor-commands.c:554
+#: ../app/actions/gradient-editor-commands.c:553
 msgid "Split Segment Uniformly"
-msgstr "����ส�ว������อ��ื�อ�"
+msgstr "����ส�ว�ย�อย�����อ��ื�อ�"
 
-#: ../app/actions/gradient-editor-commands.c:555
+#: ../app/actions/gradient-editor-commands.c:554
 msgid "Split Gradient Segment Uniformly"
 msgstr "����ส�ว��าร�ร��า�����อ��ื�อ�"
 
-#: ../app/actions/gradient-editor-commands.c:559
+#: ../app/actions/gradient-editor-commands.c:558
 msgid "Split Segments Uniformly"
 msgstr "�����ุ�ส�ว������อ��ื�อ�"
 
-#: ../app/actions/gradient-editor-commands.c:560
+#: ../app/actions/gradient-editor-commands.c:559
 msgid "Split Gradient Segments Uniformly"
 msgstr "����ส�ว��าร�ร��า�ุ�ส�ว������อ��ื�อ�"
 
-#: ../app/actions/gradient-editor-commands.c:573
+#: ../app/actions/gradient-editor-commands.c:572
 msgid "Split"
 msgstr "����"
 
@@ -2077,65 +3207,82 @@ msgstr ""
 "�ลือ��ำ�ว�ส�ว��ี���อ��ื�อ�\n"
 "�ี��ะ�����ุ�ส�ว��ี��ลือ��ว�"
 
-#: ../app/actions/gradients-actions.c:44
+#: ../app/actions/gradients-actions.c:43
+msgctxt "gradients-action"
 msgid "Gradients Menu"
 msgstr "�ม�ูสี�ร��า"
 
-#: ../app/actions/gradients-actions.c:48
+#: ../app/actions/gradients-actions.c:47
+msgctxt "gradients-action"
 msgid "_New Gradient"
 msgstr "สี�ร�_�า�หม�"
 
-#: ../app/actions/gradients-actions.c:49
-msgid "New gradient"
-msgstr "สี�ร��า�หม�"
+#: ../app/actions/gradients-actions.c:48
+msgctxt "gradients-action"
+msgid "Create a new gradient"
+msgstr "สร�า�สี�ร��า�หม�"
 
-#: ../app/actions/gradients-actions.c:54
+#: ../app/actions/gradients-actions.c:53
+msgctxt "gradients-action"
 msgid "D_uplicate Gradient"
 msgstr "สำ��าสี�_ร��า"
 
-#: ../app/actions/gradients-actions.c:55
-msgid "Duplicate gradient"
-msgstr "สำ��าสี�ร��า"
+#: ../app/actions/gradients-actions.c:54
+msgctxt "gradients-action"
+msgid "Duplicate this gradient"
+msgstr "สำ��าสี�ร��า�ี�"
 
-#: ../app/actions/gradients-actions.c:60
-#, fuzzy
+#: ../app/actions/gradients-actions.c:59
+msgctxt "gradients-action"
 msgid "Copy Gradient _Location"
-msgstr "��ิ��า��ำ�ห���"
+msgstr "�ั�ลอ�_�ำ�ห���สี�ร��า"
 
-#: ../app/actions/gradients-actions.c:61
+#: ../app/actions/gradients-actions.c:60
+msgctxt "gradients-action"
 msgid "Copy gradient file location to clipboard"
-msgstr "�ั�ลอ��ำ�ห������ม�าร�ล�สี��ยั��ลิ��อร��"
+msgstr "�ั�ลอ��ำ�ห������มสี�ร��า��ยั��ลิ��อร��"
 
-#: ../app/actions/gradients-actions.c:66
+#: ../app/actions/gradients-actions.c:65
+msgctxt "gradients-action"
 msgid "Save as _POV-Ray..."
 msgstr "�ั��ึ����� _POV-Ray..."
 
-#: ../app/actions/gradients-actions.c:67
+#: ../app/actions/gradients-actions.c:66
+#, fuzzy
+#| msgid "Save gradient as POV-Ray"
+msgctxt "gradients-action"
 msgid "Save gradient as POV-Ray"
 msgstr "�ั��ี�สี�ร��า���� POV-Ray"
 
-#: ../app/actions/gradients-actions.c:72
-#, fuzzy
+#: ../app/actions/gradients-actions.c:71
+msgctxt "gradients-action"
 msgid "_Delete Gradient"
-msgstr "_ล�สี�ร��า..."
+msgstr "_ล�สี�ร��า"
 
-#: ../app/actions/gradients-actions.c:73
-msgid "Delete gradient"
-msgstr "ล�สี�ร��า"
+#: ../app/actions/gradients-actions.c:72
+msgctxt "gradients-action"
+msgid "Delete this gradient"
+msgstr "ล�สี�ร��า�ี�"
 
-#: ../app/actions/gradients-actions.c:78
+#: ../app/actions/gradients-actions.c:77
+#, fuzzy
+#| msgid "_Refresh Gradients"
+msgctxt "gradients-action"
 msgid "_Refresh Gradients"
 msgstr "�รีย_�สี�ร��า�หม�"
 
-#: ../app/actions/gradients-actions.c:79
+#: ../app/actions/gradients-actions.c:78
+msgctxt "gradients-action"
 msgid "Refresh gradients"
 msgstr "�รีย�สี�ร��า�หม�"
 
-#: ../app/actions/gradients-actions.c:87
+#: ../app/actions/gradients-actions.c:86
+msgctxt "gradients-action"
 msgid "_Edit Gradient..."
-msgstr "����_�สี�ร��า..."
+msgstr "�_����สี�ร��า..."
 
-#: ../app/actions/gradients-actions.c:88
+#: ../app/actions/gradients-actions.c:87
+msgctxt "gradients-action"
 msgid "Edit gradient"
 msgstr "�����สี�ร��า"
 
@@ -2144,1047 +3291,1614 @@ msgstr "�����สี�ร��า"
 msgid "Save '%s' as POV-Ray"
 msgstr "�ั��ึ� '%s' ���� POV-Ray"
 
-#: ../app/actions/help-actions.c:38 ../app/actions/help-actions.c:41
+#: ../app/actions/help-actions.c:37 ../app/actions/help-actions.c:40
+msgctxt "help-action"
 msgid "_Help"
-msgstr "_��วย�หลือ"
+msgstr "_วิ�ี���"
+
+#: ../app/actions/help-actions.c:41
+msgctxt "help-action"
+msgid "Open the GIMP user manual"
+msgstr ""
 
 #: ../app/actions/help-actions.c:46
 #, fuzzy
+msgctxt "help-action"
 msgid "_Context Help"
 msgstr "�_�ื�อหา�าร��วย�หลือ"
 
-#: ../app/actions/image-actions.c:47
-msgid "Toolbox Menu"
-msgstr "ราย�าร�ล�อ���รื�อ�มือ"
+#: ../app/actions/help-actions.c:47
+msgctxt "help-action"
+msgid "Show the help for a specific user interface item"
+msgstr ""
 
-#: ../app/actions/image-actions.c:51 ../app/actions/image-actions.c:55
+#: ../app/actions/image-actions.c:48 ../app/actions/image-actions.c:52
+msgctxt "image-action"
 msgid "Image Menu"
-msgstr "ราย�ารภา�"
-
-#: ../app/actions/image-actions.c:58
-msgid "_Xtns"
-msgstr "_Xtns"
+msgstr "�ม�ูภา�"
 
-#: ../app/actions/image-actions.c:60
+#: ../app/actions/image-actions.c:55
+msgctxt "image-action"
 msgid "_Image"
 msgstr "_ภา�"
 
-#: ../app/actions/image-actions.c:61
+#: ../app/actions/image-actions.c:56
+msgctxt "image-action"
 msgid "_Mode"
-msgstr "_ระ��สีภา�"
+msgstr "�_หม�"
 
-#: ../app/actions/image-actions.c:62 ../app/actions/layers-actions.c:56
+#: ../app/actions/image-actions.c:57
+#, fuzzy
+#| msgid "_Transform"
+msgctxt "image-action"
 msgid "_Transform"
 msgstr "�_�ล�ลั�ษ�ะภา�"
 
-#: ../app/actions/image-actions.c:63
+#: ../app/actions/image-actions.c:58
+msgctxt "image-action"
 msgid "_Guides"
 msgstr "�_ส���ำ��ว"
 
-#: ../app/actions/image-actions.c:66
-#, fuzzy
+#: ../app/actions/image-actions.c:60
+msgctxt "image-action"
+msgid "_Colors"
+msgstr "_สี"
+
+#: ../app/actions/image-actions.c:61
+msgctxt "image-action"
 msgid "I_nfo"
-msgstr "_�ลั��ื�"
+msgstr "_��อมูล"
 
-#: ../app/actions/image-actions.c:67 ../app/tools/gimplevelstool.c:612
-#: ../app/tools/gimpthresholdtool.c:241
+#: ../app/actions/image-actions.c:62
+msgctxt "image-action"
 msgid "_Auto"
 msgstr "_อั���มั�ิ"
 
-#: ../app/actions/image-actions.c:68 ../app/actions/plug-in-actions.c:94
+#: ../app/actions/image-actions.c:63
+msgctxt "image-action"
 msgid "_Map"
-msgstr ""
+msgstr "�_���ั�"
 
-#: ../app/actions/image-actions.c:69
+#: ../app/actions/image-actions.c:64
 #, fuzzy
+msgctxt "image-action"
 msgid "C_omponents"
 msgstr "หมาย�ห�ุ"
 
-#: ../app/actions/image-actions.c:72 ../app/actions/image-actions.c:78
+#: ../app/actions/image-actions.c:67
+msgctxt "image-action"
 msgid "_New..."
 msgstr "�_หม�..."
 
-#: ../app/actions/image-actions.c:73 ../app/actions/image-actions.c:79
-#, fuzzy
+#: ../app/actions/image-actions.c:68
+msgctxt "image-action"
 msgid "Create a new image"
 msgstr "สร�า�ภา��หม�"
 
-#: ../app/actions/image-actions.c:84
+#: ../app/actions/image-actions.c:73
+#, fuzzy
+#| msgid "Can_vas Size..."
+msgctxt "image-action"
 msgid "Can_vas Size..."
 msgstr "��า�ห��า�ระ_�าษ..."
 
-#: ../app/actions/image-actions.c:85
+#: ../app/actions/image-actions.c:74
 #, fuzzy
+msgctxt "image-action"
 msgid "Adjust the image dimensions"
 msgstr "�รั���า�า�ุสี�ละ�วามอิ�มสี"
 
-#: ../app/actions/image-actions.c:90
-msgid "F_it Canvas to Layers"
+#: ../app/actions/image-actions.c:79
+#, fuzzy
+#| msgid "F_it Canvas to Layers"
+msgctxt "image-action"
+msgid "Fit Canvas to L_ayers"
 msgstr "_�รั�ห��า�ระ�าษ���า�ั���า�"
 
-#: ../app/actions/image-actions.c:91
+#: ../app/actions/image-actions.c:80
+#, fuzzy
+#| msgid "Resize the image to enclose all layers"
+msgctxt "image-action"
 msgid "Resize the image to enclose all layers"
 msgstr "�รั���า�ภา��หม��ห�มี��า��รอ��ลุม�ุ��ั���า�"
 
-#: ../app/actions/image-actions.c:96
+#: ../app/actions/image-actions.c:85
+#, fuzzy
+#| msgid "_Mask to Selection"
+msgctxt "image-action"
+msgid "F_it Canvas to Selection"
+msgstr "��ล�_ห��า�า������ื���ี��ลือ�"
+
+#: ../app/actions/image-actions.c:86
+#, fuzzy
+msgctxt "image-action"
+msgid "Resize the image to the extents of the selection"
+msgstr ""
+"�ลือ���า\n"
+"��ื�อ�ี��ะ�ำ�าร�ำลอ��ื���ี��าร�ลือ�"
+
+#: ../app/actions/image-actions.c:91
+msgctxt "image-action"
 msgid "_Print Size..."
-msgstr "��า�_�ิม��"
+msgstr "��า�_�ิม��..."
 
-#: ../app/actions/image-actions.c:97
+#: ../app/actions/image-actions.c:92
 #, fuzzy
+msgctxt "image-action"
 msgid "Adjust the print resolution"
 msgstr "�รั���า�า�ุสี�ละ�วามอิ�มสี"
 
-#: ../app/actions/image-actions.c:102
+#: ../app/actions/image-actions.c:97
+msgctxt "image-action"
 msgid "_Scale Image..."
-msgstr "�รั�_สั�ส�ว�ภา�..."
+msgstr "�รั�_��า�ภา�..."
 
-#: ../app/actions/image-actions.c:103
+#: ../app/actions/image-actions.c:98
 #, fuzzy
+msgctxt "image-action"
 msgid "Change the size of the image content"
-msgstr "�ำห����า��อ��าร�ส��ภา����รอ��ระวั�ิ�าร�ลั��ื�"
+msgstr "�ำห����า��อ��าร�ส��ภา����รอ��ระวั�ิ�าร�รีย��ื�"
 
-#: ../app/actions/image-actions.c:108
-msgid "_Crop Image"
-msgstr "_�ั��รอ�ภา�"
+#: ../app/actions/image-actions.c:103
+#, fuzzy
+#| msgid "Al_pha to Selection"
+msgctxt "image-action"
+msgid "_Crop to Selection"
+msgstr "��ล�_อัล�า�����ื���ี��ลือ�"
 
-#: ../app/actions/image-actions.c:109
+#: ../app/actions/image-actions.c:104
 #, fuzzy
+msgctxt "image-action"
 msgid "Crop the image to the extents of the selection"
 msgstr ""
 "�ลือ���า\n"
 "��ื�อ�ี��ะ�ำ�าร�ำลอ��ื���ี��าร�ลือ�"
 
-#: ../app/actions/image-actions.c:114
+#: ../app/actions/image-actions.c:109
+msgctxt "image-action"
 msgid "_Duplicate"
 msgstr "_สำ��า"
 
-#: ../app/actions/image-actions.c:115
+#: ../app/actions/image-actions.c:110
 #, fuzzy
+msgctxt "image-action"
 msgid "Create a duplicate of this image"
 msgstr "สร�า�ห��า�อ�หม�สำหรั�ภา��ี�"
 
-#: ../app/actions/image-actions.c:120
+#: ../app/actions/image-actions.c:115
+#, fuzzy
+#| msgid "Merge Visible _Layers..."
+msgctxt "image-action"
 msgid "Merge Visible _Layers..."
 msgstr "รวม�ั���า��ี�_มอ��ห��..."
 
-#: ../app/actions/image-actions.c:121 ../app/actions/layers-actions.c:135
+#: ../app/actions/image-actions.c:116
 #, fuzzy
+msgctxt "image-action"
 msgid "Merge all visible layers into one layer"
 msgstr "����ุ��ั���า��ี�มอ��ห���มื�อมี�ารห��ื���ี��ลือ�"
 
-#: ../app/actions/image-actions.c:126 ../app/actions/layers-actions.c:140
+#: ../app/actions/image-actions.c:121
+msgctxt "image-action"
 msgid "_Flatten Image"
 msgstr "_ยุ�รวมภา�"
 
-#: ../app/actions/image-actions.c:127 ../app/actions/layers-actions.c:141
+#: ../app/actions/image-actions.c:122
 #, fuzzy
+msgctxt "image-action"
 msgid "Merge all layers into one and remove transparency"
 msgstr "รวม�ุ��ั���า����า��วย�ั��ละ�อาส�ว��ี���ร���สออ�"
 
-#: ../app/actions/image-actions.c:132
+#: ../app/actions/image-actions.c:127
+#, fuzzy
+#| msgid "Configure G_rid..."
+msgctxt "image-action"
 msgid "Configure G_rid..."
 msgstr "�ำห����า�ส��_�ิ�ั�..."
 
-#: ../app/actions/image-actions.c:133
+#: ../app/actions/image-actions.c:128
 #, fuzzy
+msgctxt "image-action"
 msgid "Configure the grid for this image"
 msgstr "สร�า�ห��า�อ�หม�สำหรั�ภา��ี�"
 
-#: ../app/actions/image-actions.c:138
+#: ../app/actions/image-actions.c:133
 #, fuzzy
+msgctxt "image-action"
 msgid "Image Pr_operties"
 msgstr "�ุ�_สม�ั�ิ"
 
-#: ../app/actions/image-actions.c:139
+#: ../app/actions/image-actions.c:134
+#, fuzzy
+#| msgid "Display information about this image"
+msgctxt "image-action"
 msgid "Display information about this image"
 msgstr "�ส����อมูล�ี���ี�ยว�ั�ภา��ี�"
 
-#: ../app/actions/image-actions.c:148
-#, fuzzy
+#: ../app/actions/image-actions.c:142
+msgctxt "image-convert-action"
+msgid "_RGB"
+msgstr "_RGB"
+
+#: ../app/actions/image-actions.c:143
+msgctxt "image-convert-action"
 msgid "Convert the image to the RGB colorspace"
-msgstr "��ล���าสีภา�������� Indexed"
+msgstr "��ล���าสีภา�������� RGB"
 
-#: ../app/actions/image-actions.c:152
+#: ../app/actions/image-actions.c:147
+msgctxt "image-convert-action"
 msgid "_Grayscale"
-msgstr "_Grayscale"
+msgstr "����_�า"
 
-#: ../app/actions/image-actions.c:153
-#, fuzzy
+#: ../app/actions/image-actions.c:148
+msgctxt "image-convert-action"
 msgid "Convert the image to grayscale"
-msgstr "��ล���าสีภา����� Grayscale"
+msgstr "��ล���าสีภา�������������า"
 
-#: ../app/actions/image-actions.c:157
+#: ../app/actions/image-actions.c:152
+msgctxt "image-convert-action"
 msgid "_Indexed..."
-msgstr "_Indexed..."
+msgstr "_�ั��ีสี..."
 
-#: ../app/actions/image-actions.c:158
-#, fuzzy
+#: ../app/actions/image-actions.c:153
+msgctxt "image-convert-action"
 msgid "Convert the image to indexed colors"
-msgstr "��ล���าสีภา�������� Indexed"
+msgstr "��ล���าสีภา���������ั��ีสี"
 
-#: ../app/actions/image-actions.c:166
-#, fuzzy
+#: ../app/actions/image-actions.c:160
+msgctxt "image-action"
+msgid "Flip _Horizontally"
+msgstr "�ลิ���ว_�อ�"
+
+#: ../app/actions/image-actions.c:161
+msgctxt "image-action"
 msgid "Flip image horizontally"
-msgstr "�ลั�ภา���ว�อ�"
+msgstr "�ลิ�ภา�����ว�อ�"
 
-#: ../app/actions/image-actions.c:172
-#, fuzzy
+#: ../app/actions/image-actions.c:166
+msgctxt "image-action"
+msgid "Flip _Vertically"
+msgstr "�ลิ���ว_�ั��"
+
+#: ../app/actions/image-actions.c:167
+msgctxt "image-action"
 msgid "Flip image vertically"
-msgstr "�ลั�ภา���ว_�ั��"
+msgstr "�ลิ�ภา�����ว�ั��"
 
-#: ../app/actions/image-actions.c:181
+#: ../app/actions/image-actions.c:175
+msgctxt "image-action"
+msgid "Rotate 90° _clockwise"
+msgstr "หมุ� 90° _�าม���ม�าฬิ�า"
+
+#: ../app/actions/image-actions.c:176
+msgctxt "image-action"
 msgid "Rotate the image 90 degrees to the right"
 msgstr "หมุ�ภา� 90 อ�ศา���า��วา"
 
-#: ../app/actions/image-actions.c:187
-#, fuzzy
+#: ../app/actions/image-actions.c:181
+msgctxt "image-action"
+msgid "Rotate _180°"
+msgstr "หมุ� _180°"
+
+#: ../app/actions/image-actions.c:182
+msgctxt "image-action"
 msgid "Turn the image upside-down"
-msgstr "�ลั�หัว�ลั���ายภา�"
+msgstr "หมุ��ลั�หัว"
 
-#: ../app/actions/image-actions.c:193
-#, fuzzy
+#: ../app/actions/image-actions.c:187
+msgctxt "image-action"
+msgid "Rotate 90° counter-clock_wise"
+msgstr "หมุ� 90° _�ว����ม�าฬิ�า"
+
+#: ../app/actions/image-actions.c:188
+msgctxt "image-action"
 msgid "Rotate the image 90 degrees to the left"
-msgstr "หมุ��ั���า�หรือ�ื���ี��ลือ�"
+msgstr "หมุ�ภา� 90 อ�ศา���า���าย"
 
-#: ../app/actions/image-commands.c:235
+#: ../app/actions/image-commands.c:236
 msgid "Set Image Canvas Size"
 msgstr "�ั����า��า�ห��า�ระ�าษ"
 
-#: ../app/actions/image-commands.c:261 ../app/actions/image-commands.c:527
-#, fuzzy
+#: ../app/actions/image-commands.c:265 ../app/actions/image-commands.c:289
+#: ../app/actions/image-commands.c:581
 msgid "Resizing"
-msgstr "�รั���า�..."
+msgstr "�ำลั��รั���า�"
 
-#: ../app/actions/image-commands.c:285
+#: ../app/actions/image-commands.c:316
 msgid "Set Image Print Resolution"
 msgstr "�ั����า�วามละ�อีย��าร�ิม��"
 
-#: ../app/actions/image-commands.c:332
-#: ../app/pdb/drawable_transform_cmds.c:143
-#: ../app/pdb/drawable_transform_cmds.c:218
-#, fuzzy
+#: ../app/actions/image-commands.c:378
+#: ../app/pdb/drawable-transform-cmds.c:147
+#: ../app/pdb/drawable-transform-cmds.c:222
 msgid "Flipping"
-msgstr "�ำลั��ลิ�..."
+msgstr "�ำลั��ลิ�"
 
-#: ../app/actions/image-commands.c:353
-#: ../app/pdb/drawable_transform_cmds.c:515
-#: ../app/pdb/drawable_transform_cmds.c:593
-#: ../app/pdb/transform_tools_cmds.c:207 ../app/tools/gimprotatetool.c:116
-#, fuzzy
+#: ../app/actions/image-commands.c:402
+#: ../app/pdb/drawable-transform-cmds.c:524
+#: ../app/pdb/drawable-transform-cmds.c:603 ../app/pdb/image-cmds.c:533
+#: ../app/pdb/transform-tools-cmds.c:214 ../app/tools/gimprotatetool.c:122
 msgid "Rotating"
-msgstr "�ำลั�หมุ�..."
+msgstr "�ำลั�หมุ�"
 
-#: ../app/actions/image-commands.c:375 ../app/actions/layers-commands.c:601
+#: ../app/actions/image-commands.c:428 ../app/actions/layers-commands.c:683
 msgid "Cannot crop because the current selection is empty."
 msgstr "�ม�สามาร��ั��รอ���� �ื���ี��ี��ลือ�ว�า���ล�า"
 
-#: ../app/actions/image-commands.c:563
+#: ../app/actions/image-commands.c:628
 msgid "Change Print Size"
 msgstr "��ลี�ย���า��าร�ิม��"
 
-#: ../app/actions/image-commands.c:587 ../app/core/gimpimage-scale.c:73
+#: ../app/actions/image-commands.c:669 ../app/core/gimpimage-scale.c:87
 msgid "Scale Image"
-msgstr "�รั�สั�ส�ว�ภา�"
+msgstr "�รั���า�ภา�"
 
 #. Scaling
-#: ../app/actions/image-commands.c:600 ../app/actions/layers-commands.c:1052
-#: ../app/dialogs/preferences-dialog.c:1796
-#: ../app/pdb/drawable_transform_cmds.c:670
-#: ../app/pdb/drawable_transform_cmds.c:745
-#: ../app/pdb/transform_tools_cmds.c:281 ../app/tools/gimpscaletool.c:109
+#: ../app/actions/image-commands.c:680 ../app/actions/layers-commands.c:1149
+#: ../app/dialogs/preferences-dialog.c:1899
+#: ../app/pdb/drawable-transform-cmds.c:681
+#: ../app/pdb/drawable-transform-cmds.c:757 ../app/pdb/image-cmds.c:405
+#: ../app/pdb/image-cmds.c:441 ../app/pdb/layer-cmds.c:298
+#: ../app/pdb/layer-cmds.c:343 ../app/pdb/transform-tools-cmds.c:290
+#: ../app/tools/gimpscaletool.c:106
 msgid "Scaling"
-msgstr "�าร�รั�สั�ส�ว�"
+msgstr "�าร�รั���า�"
 
 #: ../app/actions/images-actions.c:43
+msgctxt "images-action"
 msgid "Images Menu"
-msgstr "ราย�ารภา�"
+msgstr "�ม�ูภา�"
 
 #: ../app/actions/images-actions.c:47
+#, fuzzy
+#| msgid "_Raise Views"
+msgctxt "images-action"
 msgid "_Raise Views"
 msgstr "สลั��าร�ส��ภา�_�ึ��"
 
 #: ../app/actions/images-actions.c:48
 #, fuzzy
+msgctxt "images-action"
 msgid "Raise this image's displays"
 msgstr "สลั�ห��า�อภา��ี��ั��มา"
 
-#: ../app/actions/images-actions.c:53 ../app/actions/view-actions.c:73
+#: ../app/actions/images-actions.c:53
+msgctxt "images-action"
 msgid "_New View"
-msgstr "�ส_��มุมมอ��หม�"
+msgstr "มุม_มอ��หม�"
 
 #: ../app/actions/images-actions.c:54
+msgctxt "images-action"
 msgid "Create a new display for this image"
-msgstr "สร�า�ห��า�อ�หม�สำหรั�ภา��ี�"
+msgstr "สร�า�ห��า��า��หม�สำหรั��ส��ภา��ี�"
 
 #: ../app/actions/images-actions.c:59
+msgctxt "images-action"
 msgid "_Delete Image"
 msgstr "_ล�ภา�"
 
 #: ../app/actions/images-actions.c:60
+msgctxt "images-action"
 msgid "Delete this image"
 msgstr "ล�ภา��ี�"
 
 #: ../app/actions/layers-actions.c:48
+msgctxt "layers-action"
 msgid "Layers Menu"
-msgstr "ราย�าร�ั���า�"
+msgstr "�ม�ู�ั���า�"
 
-#: ../app/actions/layers-actions.c:51
+#: ../app/actions/layers-actions.c:52
+msgctxt "layers-action"
 msgid "_Layer"
 msgstr "_�ั���า�"
 
-#: ../app/actions/layers-actions.c:52
+#: ../app/actions/layers-actions.c:54
+#, fuzzy
+#| msgid "Stac_k"
+msgctxt "layers-action"
 msgid "Stac_k"
 msgstr "ลำ�ั_�"
 
-#: ../app/actions/layers-actions.c:53
+#: ../app/actions/layers-actions.c:56
 #, fuzzy
+msgctxt "layers-action"
 msgid "Te_xt to Selection"
 msgstr "�_�ิ�ม�����ื���ี��ลือ�"
 
-#: ../app/actions/layers-actions.c:54
+#: ../app/actions/layers-actions.c:58
+msgctxt "layers-action"
 msgid "_Mask"
 msgstr "_ห��า�า�"
 
-#: ../app/actions/layers-actions.c:55
+#: ../app/actions/layers-actions.c:60
+msgctxt "layers-action"
 msgid "Tr_ansparency"
 msgstr "�วาม�_�ร���ส"
 
-#: ../app/actions/layers-actions.c:57
+#: ../app/actions/layers-actions.c:62
+#, fuzzy
+#| msgid "_Transform"
+msgctxt "layers-action"
+msgid "_Transform"
+msgstr "�_�ล�ลั�ษ�ะภา�"
+
+#: ../app/actions/layers-actions.c:64
+#, fuzzy
+#| msgid "_Properties"
+msgctxt "layers-action"
 msgid "_Properties"
 msgstr "�ุ�_สม�ั�ิ"
 
-#: ../app/actions/layers-actions.c:59
+#: ../app/actions/layers-actions.c:66
+msgctxt "layers-action"
+msgid "_Opacity"
+msgstr "�วาม_�ึ��ส�"
+
+#: ../app/actions/layers-actions.c:68
+msgctxt "layers-action"
 msgid "Layer _Mode"
-msgstr "สภา_วะ�ั���า�"
+msgstr "�_หม��ั���า�"
 
-#: ../app/actions/layers-actions.c:62
+#: ../app/actions/layers-actions.c:71
+msgctxt "layers-action"
 msgid "Te_xt Tool"
-msgstr "��รือ�_มือ��อ�วาม"
+msgstr "��รือ�มือ_��อ�วาม"
 
-#: ../app/actions/layers-actions.c:63
+#: ../app/actions/layers-actions.c:72
+#, fuzzy
+#| msgid "Activate the text tool on this text layer"
+msgctxt "layers-action"
 msgid "Activate the text tool on this text layer"
 msgstr "�รีย������รื�อ�มือ��อ�วาม���ั���า���อ�วาม�ี�"
 
-#: ../app/actions/layers-actions.c:68
+#: ../app/actions/layers-actions.c:77
+#, fuzzy
+#| msgid "_Edit Layer Attributes..."
+msgctxt "layers-action"
 msgid "_Edit Layer Attributes..."
 msgstr "������ุ�ส_ม�ั�ิ�ั���า�..."
 
-#: ../app/actions/layers-actions.c:69
-#, fuzzy
+#: ../app/actions/layers-actions.c:78
+msgctxt "layers-action"
 msgid "Edit the layer's name"
-msgstr "������ุ�สม�ั�ิ�ั���า�"
+msgstr "������ื�อ�ั���า�"
 
-#: ../app/actions/layers-actions.c:74
+#: ../app/actions/layers-actions.c:83 ../app/actions/layers-actions.c:591
+msgctxt "layers-action"
 msgid "_New Layer..."
 msgstr "�ั��_�า��หม�..."
 
-#: ../app/actions/layers-actions.c:75
+#: ../app/actions/layers-actions.c:84
 #, fuzzy
+msgctxt "layers-action"
 msgid "Create a new layer and add it to the image"
 msgstr "สร�า�ห��า�อ�หม�สำหรั�ภา��ี�"
 
-#: ../app/actions/layers-actions.c:80
+#: ../app/actions/layers-actions.c:89 ../app/actions/layers-actions.c:592
+msgctxt "layers-action"
 msgid "_New Layer"
 msgstr "�ั��_�า��หม�"
 
-#: ../app/actions/layers-actions.c:81
+#: ../app/actions/layers-actions.c:90
 #, fuzzy
+msgctxt "layers-action"
 msgid "Create a new layer with last used values"
 msgstr "�ั���า��หม���วย��าล�าสุ�"
 
-#: ../app/actions/layers-actions.c:86
+#: ../app/actions/layers-actions.c:95
+#, fuzzy
+#| msgid "Copy _Visible"
+msgctxt "layers-action"
+msgid "New from _Visible"
+msgstr "�ั�ลอ����าะ�ี�มอ��_ห��"
+
+#: ../app/actions/layers-actions.c:97
+#, fuzzy
+#| msgid "Create a new template from this image"
+msgctxt "layers-action"
+msgid "Create a new layer from what is visible in this image"
+msgstr "สร�า��ม�����หม���วยภา��ี�"
+
+#: ../app/actions/layers-actions.c:102
+msgctxt "layers-action"
+msgid "New Layer _Group..."
+msgstr "_�ลุ�ม�ั���า��หม�..."
+
+#: ../app/actions/layers-actions.c:103
+#, fuzzy
+msgctxt "layers-action"
+msgid "Create a new layer group and add it to the image"
+msgstr "สร�า�ห��า�อ�หม�สำหรั�ภา��ี�"
+
+#: ../app/actions/layers-actions.c:108
+msgctxt "layers-action"
 msgid "D_uplicate Layer"
 msgstr "สำ�_�า�ั���า�"
 
-#: ../app/actions/layers-actions.c:87
+#: ../app/actions/layers-actions.c:110
+#, fuzzy
+#| msgid "Create a duplicate of the layer and add it to the image"
+msgctxt "layers-action"
 msgid "Create a duplicate of the layer and add it to the image"
 msgstr "สร�า�สำ��า�อ��ั���า��ละ��ิ�ม���า��ภา�"
 
-#: ../app/actions/layers-actions.c:92
+#: ../app/actions/layers-actions.c:115
+msgctxt "layers-action"
 msgid "_Delete Layer"
 msgstr "_ล��ั���า�"
 
-#: ../app/actions/layers-actions.c:93
-#, fuzzy
+#: ../app/actions/layers-actions.c:116
+msgctxt "layers-action"
 msgid "Delete this layer"
-msgstr "ล��ั���า�"
+msgstr "ล��ั���า��ี�"
 
-#: ../app/actions/layers-actions.c:98
+#: ../app/actions/layers-actions.c:121
+#, fuzzy
+#| msgid "_Raise Layer"
+msgctxt "layers-action"
 msgid "_Raise Layer"
 msgstr "สลั��ั���า�_�ึ��"
 
-#: ../app/actions/layers-actions.c:99
+#: ../app/actions/layers-actions.c:122
+#, fuzzy
+#| msgid "Raise this layer one step in the layer stack"
+msgctxt "layers-action"
 msgid "Raise this layer one step in the layer stack"
 msgstr "สลั��ั���า���ลำ�ั��ั���า��ึ��มาห�ึ���ั��"
 
-#: ../app/actions/layers-actions.c:104
+#: ../app/actions/layers-actions.c:127
+#, fuzzy
+#| msgid "Layer to _Top"
+msgctxt "layers-action"
 msgid "Layer to _Top"
 msgstr "�ั���า���_��สุ�"
 
-#: ../app/actions/layers-actions.c:105
+#: ../app/actions/layers-actions.c:128
+#, fuzzy
+#| msgid "Move this layer to the top of the layer stack"
+msgctxt "layers-action"
 msgid "Move this layer to the top of the layer stack"
 msgstr "�ลื�อ��ั���า��ี�����สุ��อ�ลำ�ั��ั���า�"
 
-#: ../app/actions/layers-actions.c:110
+#: ../app/actions/layers-actions.c:133
+#, fuzzy
+#| msgid "_Lower Layer"
+msgctxt "layers-action"
 msgid "_Lower Layer"
 msgstr "สลั��ั���า�_ล�"
 
-#: ../app/actions/layers-actions.c:111
+#: ../app/actions/layers-actions.c:134
+#, fuzzy
+#| msgid "Lower this layer one step in the layer stack"
+msgctxt "layers-action"
 msgid "Lower this layer one step in the layer stack"
 msgstr "สลั��ั���า��ี���ลำ�ั��ั���า�ล���ห�ึ���ั��"
 
-#: ../app/actions/layers-actions.c:116
+#: ../app/actions/layers-actions.c:139
+#, fuzzy
+#| msgid "Layer to _Bottom"
+msgctxt "layers-action"
 msgid "Layer to _Bottom"
 msgstr "�ั���า���_ล�า�สุ�"
 
-#: ../app/actions/layers-actions.c:117
+#: ../app/actions/layers-actions.c:140
+#, fuzzy
+#| msgid "Move this layer to the bottom of the layer stack"
+msgctxt "layers-action"
 msgid "Move this layer to the bottom of the layer stack"
 msgstr "�ลื�อ��ั���า��ี���ล�า�สุ��อ�ลำ�ั��ั���า�"
 
-#: ../app/actions/layers-actions.c:122
+#: ../app/actions/layers-actions.c:145
+#, fuzzy
+#| msgid "_Anchor Layer"
+msgctxt "layers-action"
 msgid "_Anchor Layer"
 msgstr "_�ั��ัว�ั���า�"
 
-#: ../app/actions/layers-actions.c:123
+#: ../app/actions/layers-actions.c:146
 #, fuzzy
+msgctxt "layers-action"
 msgid "Anchor the floating layer"
 msgstr "�ั��ัว�ั���า�ลอย�ัว"
 
-#: ../app/actions/layers-actions.c:128
+#: ../app/actions/layers-actions.c:151
+msgctxt "layers-action"
 msgid "Merge Do_wn"
 msgstr "รวม�ั���า_�ล�า�"
 
-#: ../app/actions/layers-actions.c:129
+#: ../app/actions/layers-actions.c:152
+#, fuzzy
+#| msgid "Merge this layer with the one below it"
+msgctxt "layers-action"
 msgid "Merge this layer with the one below it"
 msgstr "รวม�ั���า��ี��ั��ั���า��ี�อยู���ำ�ว�าห�ึ���ั��"
 
-#: ../app/actions/layers-actions.c:134
+#: ../app/actions/layers-actions.c:157
+msgctxt "layers-action"
+msgid "Merge Layer Group"
+msgstr "รวม�ลุ�ม�ั���า�"
+
+#: ../app/actions/layers-actions.c:158
+#, fuzzy
+msgctxt "layers-action"
+msgid "Merge the layer group's layers into one normal layer"
+msgstr "����ุ��ั���า��ี�มอ��ห���มื�อมี�ารห��ื���ี��ลือ�"
+
+#: ../app/actions/layers-actions.c:163
+msgctxt "layers-action"
 msgid "Merge _Visible Layers..."
-msgstr "รวม�ั���า��ี�_มอ��ห��..."
+msgstr "รวม�ั���า��ี�_�รา��..."
 
-#: ../app/actions/layers-actions.c:146
+#: ../app/actions/layers-actions.c:164
+msgctxt "layers-action"
+msgid "Merge all visible layers into one layer"
+msgstr "รวม�ุ��ั���า��ี��รา��อยู��ห������ั���า���ียว"
+
+#: ../app/actions/layers-actions.c:169
+msgctxt "layers-action"
+msgid "_Flatten Image"
+msgstr "_ยุ�รวมภา�"
+
+#: ../app/actions/layers-actions.c:170
+msgctxt "layers-action"
+msgid "Merge all layers into one and remove transparency"
+msgstr "รวม�ุ��ั���า����า��วย�ั��ละ�อาส�ว��ี���ร���สออ�"
+
+#: ../app/actions/layers-actions.c:175
+#, fuzzy
+#| msgid "_Discard Text Information"
+msgctxt "layers-action"
 msgid "_Discard Text Information"
 msgstr "ละ_�ิ����อมูล��อ�วาม"
 
-#: ../app/actions/layers-actions.c:147
+#: ../app/actions/layers-actions.c:176
+#, fuzzy
+#| msgid "Turn this text layer into a normal layer"
+msgctxt "layers-action"
 msgid "Turn this text layer into a normal layer"
 msgstr "��ลี�ย��ั���า���อ�วาม�ี������ั���า����ิ"
 
-#: ../app/actions/layers-actions.c:152
+#: ../app/actions/layers-actions.c:181
 #, fuzzy
+msgctxt "layers-action"
 msgid "Text to _Path"
 msgstr "�����ส��_�า�"
 
-#: ../app/actions/layers-actions.c:153
+#: ../app/actions/layers-actions.c:182
 #, fuzzy
+msgctxt "layers-action"
 msgid "Create a path from this text layer"
 msgstr "สร�า��ส���า��า�อั�ษร"
 
-#: ../app/actions/layers-actions.c:158
+#: ../app/actions/layers-actions.c:187
+#, fuzzy
+msgctxt "layers-action"
 msgid "Text alon_g Path"
-msgstr ""
+msgstr "�����ส��_�า�"
 
-#: ../app/actions/layers-actions.c:159
+#: ../app/actions/layers-actions.c:188
+#, fuzzy
+#| msgid "Warp this layer's text along the current path"
+msgctxt "layers-action"
 msgid "Warp this layer's text along the current path"
 msgstr "วา���อ�วาม�อ��ั���า��ี��าม�ส���า�"
 
-#: ../app/actions/layers-actions.c:164
+#: ../app/actions/layers-actions.c:193
+#, fuzzy
+#| msgid "Layer B_oundary Size..."
+msgctxt "layers-action"
 msgid "Layer B_oundary Size..."
 msgstr "��า�_�อ�����ั���า�..."
 
-#: ../app/actions/layers-actions.c:165
+#: ../app/actions/layers-actions.c:194
 #, fuzzy
+msgctxt "layers-action"
 msgid "Adjust the layer dimensions"
 msgstr "�รั���า�า�ุสี�ละ�วามอิ�มสี"
 
-#: ../app/actions/layers-actions.c:170
+#: ../app/actions/layers-actions.c:199
+#, fuzzy
+#| msgid "Layer to _Image Size"
+msgctxt "layers-action"
 msgid "Layer to _Image Size"
 msgstr "��า��ั��_�า����าภา�"
 
-#: ../app/actions/layers-actions.c:171
+#: ../app/actions/layers-actions.c:200
+#, fuzzy
+#| msgid "Resize the layer to the size of the image"
+msgctxt "layers-action"
 msgid "Resize the layer to the size of the image"
 msgstr "�รั���า��อ��ั���า�������า���ียว�ั�ภา�"
 
-#: ../app/actions/layers-actions.c:176
+#: ../app/actions/layers-actions.c:205
+#, fuzzy
+#| msgid "_Scale Layer..."
+msgctxt "layers-action"
 msgid "_Scale Layer..."
 msgstr "�รั�_สั�ส�ว��ั���า�..."
 
-#: ../app/actions/layers-actions.c:177
+#: ../app/actions/layers-actions.c:206
+#, fuzzy
+#| msgid "Change the size of the layer content"
+msgctxt "layers-action"
 msgid "Change the size of the layer content"
 msgstr "��ลี�ย���า��ื���ี��อ��ั���า�"
 
-#: ../app/actions/layers-actions.c:182
+#: ../app/actions/layers-actions.c:211
 #, fuzzy
-msgid "_Crop Layer"
-msgstr "�ั��รอ��ั���า�"
+#| msgid "Al_pha to Selection"
+msgctxt "layers-action"
+msgid "_Crop to Selection"
+msgstr "��ล�_อัล�า�����ื���ี��ลือ�"
 
-#: ../app/actions/layers-actions.c:183
+#: ../app/actions/layers-actions.c:212
 #, fuzzy
+msgctxt "layers-action"
 msgid "Crop the layer to the extents of the selection"
 msgstr "�ลั���า��ั���า�หรือ�ื���ี��ลือ�"
 
-#: ../app/actions/layers-actions.c:188
+#: ../app/actions/layers-actions.c:217
+#, fuzzy
+#| msgid "Add La_yer Mask..."
+msgctxt "layers-action"
 msgid "Add La_yer Mask..."
 msgstr "��ิ�ม�ั��_ห��า�า�..."
 
-#: ../app/actions/layers-actions.c:189
+#: ../app/actions/layers-actions.c:219
+msgctxt "layers-action"
 msgid "Add a mask that allows non-destructive editing of transparency"
 msgstr ""
 
-#: ../app/actions/layers-actions.c:194
+#: ../app/actions/layers-actions.c:224
+#, fuzzy
+#| msgid "Add Alpha C_hannel"
+msgctxt "layers-action"
 msgid "Add Alpha C_hannel"
 msgstr "��ิ�ม�����ล_อัล�า"
 
-#: ../app/actions/layers-actions.c:195
+#: ../app/actions/layers-actions.c:225
+#, fuzzy
+#| msgid "Add transparency information to the layer"
+msgctxt "layers-action"
 msgid "Add transparency information to the layer"
 msgstr "��ิ�ม��อมูล�วาม��ร���สล����ั���า�"
 
-#: ../app/actions/layers-actions.c:200
+#: ../app/actions/layers-actions.c:230
 #, fuzzy
+msgctxt "layers-action"
 msgid "_Remove Alpha Channel"
 msgstr "�อา�����ลออ�"
 
-#: ../app/actions/layers-actions.c:201
+#: ../app/actions/layers-actions.c:231
+#, fuzzy
+#| msgid "Remove transparency information from the layer"
+msgctxt "layers-action"
 msgid "Remove transparency information from the layer"
 msgstr "ล���อมูล�วาม��ร���สออ��า��ั���า�"
 
-#: ../app/actions/layers-actions.c:209
+#: ../app/actions/layers-actions.c:239
 #, fuzzy
+msgctxt "layers-action"
 msgid "Lock Alph_a Channel"
 msgstr "��ิ�ม�����ลอัล�า"
 
-#: ../app/actions/layers-actions.c:210
+#: ../app/actions/layers-actions.c:241
 #, fuzzy
+msgctxt "layers-action"
 msgid "Keep transparency information on this layer from being modified"
 msgstr "����อมูล�วาม��ร���ส�อ��ั���า��ี�"
 
-#: ../app/actions/layers-actions.c:216
+#: ../app/actions/layers-actions.c:247
 #, fuzzy
+msgctxt "layers-action"
 msgid "_Edit Layer Mask"
 msgstr "������ั��ห��า�า�"
 
-#: ../app/actions/layers-actions.c:217
+#: ../app/actions/layers-actions.c:248
 #, fuzzy
+msgctxt "layers-action"
 msgid "Work on the layer mask"
 msgstr "ล��ั���า�ห��า�า�"
 
-#: ../app/actions/layers-actions.c:223
+#: ../app/actions/layers-actions.c:254
 #, fuzzy
+msgctxt "layers-action"
 msgid "S_how Layer Mask"
 msgstr "�ส���ั��ห��า�า�"
 
-#: ../app/actions/layers-actions.c:229
+#: ../app/actions/layers-actions.c:260
 #, fuzzy
+msgctxt "layers-action"
 msgid "_Disable Layer Mask"
 msgstr "ระ�ั��ั��ห��า�า�"
 
-#: ../app/actions/layers-actions.c:230
+#: ../app/actions/layers-actions.c:261
 #, fuzzy
+msgctxt "layers-action"
 msgid "Dismiss the effect of the layer mask"
 msgstr "ล��ั���า�ห��า�า�"
 
-#: ../app/actions/layers-actions.c:239
+#: ../app/actions/layers-actions.c:270
+#, fuzzy
+#| msgid "Apply Layer _Mask"
+msgctxt "layers-action"
 msgid "Apply Layer _Mask"
 msgstr "����า��ั��ห��า_�า�"
 
-#: ../app/actions/layers-actions.c:240
+#: ../app/actions/layers-actions.c:271
 #, fuzzy
+msgctxt "layers-action"
 msgid "Apply the effect of the layer mask and remove it"
 msgstr "�ระยุ������ลั�ษ�ะ�ิ�ศษ�อ�ห��า�า��ั���า��ละล�ออ�"
 
-#: ../app/actions/layers-actions.c:245
+#: ../app/actions/layers-actions.c:276
+#, fuzzy
+#| msgid "Delete Layer Mas_k"
+msgctxt "layers-action"
 msgid "Delete Layer Mas_k"
 msgstr "ล��ั��ห_��า�า�"
 
-#: ../app/actions/layers-actions.c:246
+#: ../app/actions/layers-actions.c:277
 #, fuzzy
+msgctxt "layers-action"
 msgid "Remove the layer mask and its effect"
 msgstr "หมุ��ั���า�หรือ�ื���ี��ลือ�"
 
-#: ../app/actions/layers-actions.c:254
+#: ../app/actions/layers-actions.c:285
+#, fuzzy
+#| msgid "_Mask to Selection"
+msgctxt "layers-action"
 msgid "_Mask to Selection"
 msgstr "��ล�_ห��า�า������ื���ี��ลือ�"
 
-#: ../app/actions/layers-actions.c:255
+#: ../app/actions/layers-actions.c:286
 #, fuzzy
+msgctxt "layers-action"
 msgid "Replace the selection with the layer mask"
 msgstr "�ี�ส���าม�อ��าร�ลือ���วย��าล�าสุ�"
 
-#: ../app/actions/layers-actions.c:261
+#: ../app/actions/layers-actions.c:291
+#, fuzzy
+#| msgid "_Add to Selection"
+msgctxt "layers-action"
+msgid "_Add to Selection"
+msgstr "�_�ิ�ม���า�����ื���ี��ลือ�"
+
+#: ../app/actions/layers-actions.c:292
 #, fuzzy
+msgctxt "layers-action"
 msgid "Add the layer mask to the current selection"
 msgstr "รวม�ั��ี���ี��ี��ลือ�อยู�"
 
-#: ../app/actions/layers-actions.c:267
+#: ../app/actions/layers-actions.c:297 ../app/actions/layers-actions.c:326
+#: ../app/actions/layers-actions.c:356
+#, fuzzy
+#| msgid "_Subtract from Selection"
+msgctxt "layers-action"
+msgid "_Subtract from Selection"
+msgstr "_ล�ออ��า��ื���ี��ลือ�"
+
+#: ../app/actions/layers-actions.c:298
 #, fuzzy
+msgctxt "layers-action"
 msgid "Subtract the layer mask from the current selection"
 msgstr "ล�ออ��า��ี���ี��ี��ลือ�อยู�"
 
-#: ../app/actions/layers-actions.c:273
+#: ../app/actions/layers-actions.c:303 ../app/actions/layers-actions.c:333
+#: ../app/actions/layers-actions.c:363
+#, fuzzy
+#| msgid "_Intersect with Selection"
+msgctxt "layers-action"
+msgid "_Intersect with Selection"
+msgstr "หาส�ว��ั�_��อ��ั��ื���ี��ลือ�"
+
+#: ../app/actions/layers-actions.c:304
 #, fuzzy
+msgctxt "layers-action"
 msgid "Intersect the layer mask with the current selection"
 msgstr "���าะ�ี���ำ�ั��ี���ี��ี��ลือ�อยู�"
 
-#: ../app/actions/layers-actions.c:281
+#: ../app/actions/layers-actions.c:312
+#, fuzzy
+#| msgid "Al_pha to Selection"
+msgctxt "layers-action"
 msgid "Al_pha to Selection"
 msgstr "��ล�_อัล�า�����ื���ี��ลือ�"
 
-#: ../app/actions/layers-actions.c:282
+#: ../app/actions/layers-actions.c:314
 #, fuzzy
+msgctxt "layers-action"
 msgid "Replace the selection with the layer's alpha channel"
 msgstr "_��าย�อ���อ�ภา�อัล�า�อ��ั���า�"
 
-#: ../app/actions/layers-actions.c:287 ../app/actions/layers-actions.c:314
+#: ../app/actions/layers-actions.c:319 ../app/actions/layers-actions.c:349
+#, fuzzy
+#| msgid "A_dd to Selection"
+msgctxt "layers-action"
 msgid "A_dd to Selection"
 msgstr "�_�ิ�ม���ื���ี��ลือ�"
 
-#: ../app/actions/layers-actions.c:288
+#: ../app/actions/layers-actions.c:321
 #, fuzzy
+msgctxt "layers-action"
 msgid "Add the layer's alpha channel to the current selection"
 msgstr "รวม�ั��ี���ี��ี��ลือ�อยู�"
 
-#: ../app/actions/layers-actions.c:294
+#: ../app/actions/layers-actions.c:328
 #, fuzzy
+msgctxt "layers-action"
 msgid "Subtract the layer's alpha channel from the current selection"
 msgstr "ล�ออ��า��ี���ี��ี��ลือ�อยู�"
 
-#: ../app/actions/layers-actions.c:300
+#: ../app/actions/layers-actions.c:335
 #, fuzzy
+msgctxt "layers-action"
 msgid "Intersect the layer's alpha channel with the current selection"
 msgstr "���าะ�ี���ำ�ั��ี���ี��ี��ลือ�อยู�"
 
-#: ../app/actions/layers-actions.c:308
+#: ../app/actions/layers-actions.c:343
 #, fuzzy
+msgctxt "layers-action"
 msgid "_Text to Selection"
 msgstr "�_�ิ�ม�����ื���ี��ลือ�"
 
-#: ../app/actions/layers-actions.c:309
+#: ../app/actions/layers-actions.c:344
+#, fuzzy
+#| msgid "Replace the selection with the text layer's outline"
+msgctxt "layers-action"
 msgid "Replace the selection with the text layer's outline"
 msgstr "ย�าย�ิ���ี��าร�ลือ���วย��ร�ร�า��อ��ั���า���อ�วาม"
 
-#: ../app/actions/layers-actions.c:315
+#: ../app/actions/layers-actions.c:351
 #, fuzzy
+msgctxt "layers-action"
 msgid "Add the text layer's outline to the current selection"
 msgstr "รวม�ั��ี���ี��ี��ลือ�อยู�"
 
-#: ../app/actions/layers-actions.c:321
+#: ../app/actions/layers-actions.c:358
 #, fuzzy
+msgctxt "layers-action"
 msgid "Subtract the text layer's outline from the current selection"
 msgstr "ล�ออ��า��ี���ี��ี��ลือ�อยู�"
 
-#: ../app/actions/layers-actions.c:327
+#: ../app/actions/layers-actions.c:365
 #, fuzzy
+msgctxt "layers-action"
 msgid "Intersect the text layer's outline with the current selection"
 msgstr "���าะ�ี���ำ�ั��ี���ี��ี��ลือ�อยู�"
 
-#: ../app/actions/layers-actions.c:335
+#: ../app/actions/layers-actions.c:373
+#, fuzzy
+#| msgid "Select _Top Layer"
+msgctxt "layers-action"
 msgid "Select _Top Layer"
 msgstr "�ลือ�_�ั���า���สุ�"
 
-#: ../app/actions/layers-actions.c:340
+#: ../app/actions/layers-actions.c:374
+#, fuzzy
+#| msgid "Select _Bottom Layer"
+msgctxt "layers-action"
+msgid "Select the topmost layer"
+msgstr "�ลือ��ั��_�า�ล�า�สุ�"
+
+#: ../app/actions/layers-actions.c:379
+#, fuzzy
+#| msgid "Select _Bottom Layer"
+msgctxt "layers-action"
 msgid "Select _Bottom Layer"
 msgstr "�ลือ��ั��_�า�ล�า�สุ�"
 
-#: ../app/actions/layers-actions.c:345
+#: ../app/actions/layers-actions.c:380
+#, fuzzy
+#| msgid "Select _Bottom Layer"
+msgctxt "layers-action"
+msgid "Select the bottommost layer"
+msgstr "�ลือ��ั��_�า�ล�า�สุ�"
+
+#: ../app/actions/layers-actions.c:385
+#, fuzzy
+#| msgid "Select _Previous Layer"
+msgctxt "layers-action"
 msgid "Select _Previous Layer"
 msgstr "�ลือ��ั���า���_อ�ห��า"
 
-#: ../app/actions/layers-actions.c:350
+#: ../app/actions/layers-actions.c:386
+#, fuzzy
+msgctxt "layers-action"
+msgid "Select the layer above the current layer"
+msgstr "ล�ออ��า��ี���ี��ี��ลือ�อยู�"
+
+#: ../app/actions/layers-actions.c:391
+#, fuzzy
+#| msgid "Select _Next Layer"
+msgctxt "layers-action"
 msgid "Select _Next Layer"
 msgstr "�ลือ��ั���า�_�ั���"
 
-#: ../app/actions/layers-actions.c:358
-msgid "Set Opacity"
-msgstr "�ั����า�วาม�ึ��ส�"
+#: ../app/actions/layers-actions.c:392
+#, fuzzy
+msgctxt "layers-action"
+msgid "Select the layer below the current layer"
+msgstr "���าะ�ี���ำ�ั��ี���ี��ี��ลือ�อยู�"
+
+#: ../app/actions/layers-actions.c:586 ../app/actions/layers-actions.c:587
+#, fuzzy
+#| msgid "_New Layer"
+msgctxt "layers-action"
+msgid "To _New Layer"
+msgstr "�ั��_�า��หม�"
 
-#: ../app/actions/layers-commands.c:199
+#: ../app/actions/layers-commands.c:203
 msgid "Layer Attributes"
 msgstr "�ุ�สม�ั�ิ�ั���า�"
 
-#: ../app/actions/layers-commands.c:202
+#: ../app/actions/layers-commands.c:206
 msgid "Edit Layer Attributes"
 msgstr "������ุ�สม�ั�ิ�ั���า�"
 
-#: ../app/actions/layers-commands.c:236 ../app/actions/layers-commands.c:238
-#: ../app/actions/layers-commands.c:295 ../app/actions/layers-commands.c:299
-#: ../app/widgets/gimpdrawabletreeview.c:326
-#: ../app/widgets/gimplayertreeview.c:867
+#: ../app/actions/layers-commands.c:250 ../app/core/gimplayer.c:257
+msgid "Layer"
+msgstr "�ั���า�"
+
+#: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320
+#: ../app/widgets/gimpdrawabletreeview.c:337
+#: ../app/widgets/gimplayertreeview.c:863
 msgid "New Layer"
 msgstr "�ั���า��หม�"
 
-#: ../app/actions/layers-commands.c:241
+#: ../app/actions/layers-commands.c:255
 msgid "Create a New Layer"
 msgstr "สร�า��ั���า��หม�"
 
-#: ../app/actions/layers-commands.c:534
+#: ../app/actions/layers-commands.c:356
+msgid "Visible"
+msgstr "�รา��"
+
+#: ../app/actions/layers-commands.c:614
 msgid "Set Layer Boundary Size"
 msgstr "�ั����า��า��อ��ั���า�"
 
-#: ../app/actions/layers-commands.c:578 ../app/core/gimplayer.c:248
+#: ../app/actions/layers-commands.c:655 ../app/core/gimplayer.c:260
 msgid "Scale Layer"
 msgstr "�รั�สั�ส�ว��ั���า�"
 
-#: ../app/actions/layers-commands.c:611
+#: ../app/actions/layers-commands.c:693
 msgid "Crop Layer"
 msgstr "�ั��รอ��ั���า�"
 
-#: ../app/actions/layers-commands.c:750
+#: ../app/actions/layers-commands.c:832
 msgid "Layer Mask to Selection"
 msgstr "��ลี�ย��ั��ห��า�า�������ื���ี�ลือ��"
 
-#: ../app/actions/layers-commands.c:984
+#: ../app/actions/layers-commands.c:1084
 #, fuzzy
 msgid "Please select a channel first"
 msgstr "�ั��ี��ี���ี��าร�ลือ����������ล"
 
-#: ../app/actions/layers-commands.c:992 ../app/core/gimplayer.c:1255
-#: ../app/dialogs/layer-add-mask-dialog.c:80
+#: ../app/actions/layers-commands.c:1092 ../app/core/gimplayer.c:1399
+#: ../app/dialogs/layer-add-mask-dialog.c:82
 msgid "Add Layer Mask"
 msgstr "��ิ�ม�ั��ห��า�า�"
 
-#: ../app/actions/layers-commands.c:1068 ../app/actions/layers-commands.c:1106
-msgid "Invalid width or height. Both must be positive."
-msgstr "��า�วาม�ว�า�หรือ�วามสู��ม��ู���อ� �วรมี��า�����ว�"
-
-#: ../app/actions/palette-editor-actions.c:44
+#: ../app/actions/palette-editor-actions.c:43
+#, fuzzy
+#| msgid "Palette Editor Menu"
+msgctxt "palette-editor-action"
 msgid "Palette Editor Menu"
-msgstr "ราย�าร�ัว������า�สี"
+msgstr "ราย�าร��รื�อ�มือ������า�สี"
 
-#: ../app/actions/palette-editor-actions.c:54
+#: ../app/actions/palette-editor-actions.c:47
+msgctxt "palette-editor-action"
+msgid "_Edit Color..."
+msgstr "�_����สี..."
+
+#: ../app/actions/palette-editor-actions.c:48
+msgctxt "palette-editor-action"
+msgid "Edit this entry"
+msgstr "�����ราย�าร�ี�"
+
+#: ../app/actions/palette-editor-actions.c:53
+msgctxt "palette-editor-action"
 msgid "_Delete Color"
 msgstr "_ล�สี"
 
-#: ../app/actions/palette-editor-actions.c:55
-msgid "Delete color"
-msgstr "ล�สี"
+#: ../app/actions/palette-editor-actions.c:54
+msgctxt "palette-editor-action"
+msgid "Delete this entry"
+msgstr "ล�ราย�าร�ี�"
 
-#: ../app/actions/palette-editor-actions.c:63
+#: ../app/actions/palette-editor-actions.c:62
 #, fuzzy
+msgctxt "palette-editor-action"
 msgid "Edit Active Palette"
 msgstr "������า�สี"
 
-#: ../app/actions/palette-editor-actions.c:72
+#: ../app/actions/palette-editor-actions.c:71
+#, fuzzy
+#| msgid "New Color from _FG"
+msgctxt "palette-editor-action"
 msgid "New Color from _FG"
 msgstr "สี�หม��า�สี�ื��_ห��า"
 
 #: ../app/actions/palette-editor-actions.c:73
 #, fuzzy
-msgid "New color from foreground color"
+msgctxt "palette-editor-action"
+msgid "Create a new entry from the foreground color"
 msgstr "��ลี�ย��ี�สี�ื��ห��า"
 
 #: ../app/actions/palette-editor-actions.c:78
+#, fuzzy
+#| msgid "New Color from _BG"
+msgctxt "palette-editor-action"
 msgid "New Color from _BG"
 msgstr "สี�หม��า�สี�ื��ห_ลั�"
 
-#: ../app/actions/palette-editor-actions.c:79
+#: ../app/actions/palette-editor-actions.c:80
 #, fuzzy
-msgid "New color from background color"
+msgctxt "palette-editor-action"
+msgid "Create a new entry from the background color"
 msgstr "��ลี�ย��ี�สี�ื��หลั�"
 
-#: ../app/actions/palette-editor-actions.c:87
-#: ../app/actions/view-actions.c:242
+#: ../app/actions/palette-editor-actions.c:88
 msgid "Zoom _In"
-msgstr "�_ยาย"
+msgstr "�ูม�_��า"
 
-#: ../app/actions/palette-editor-actions.c:93
-#: ../app/actions/view-actions.c:236
+#: ../app/actions/palette-editor-actions.c:94
 msgid "Zoom _Out"
-msgstr "ย�_อ"
+msgstr "�ูม_ออ�"
 
-#: ../app/actions/palette-editor-actions.c:99
+#: ../app/actions/palette-editor-actions.c:100
 msgid "Zoom _All"
 msgstr "�ส���ั��ห_ม�"
 
-#: ../app/actions/palette-editor-commands.c:69
+#: ../app/actions/palette-editor-commands.c:68
 msgid "Edit Palette Color"
 msgstr "������า�สี"
 
-#: ../app/actions/palette-editor-commands.c:71
+#: ../app/actions/palette-editor-commands.c:70
 msgid "Edit Color Palette Entry"
 msgstr "�����ราย�ารสี���า�สี"
 
-#: ../app/actions/palettes-actions.c:44
+#: ../app/actions/palettes-actions.c:43
+msgctxt "palettes-action"
 msgid "Palettes Menu"
-msgstr "ราย�าร�า�สี"
+msgstr "�ม�ู�า�สี"
 
-#: ../app/actions/palettes-actions.c:48
+#: ../app/actions/palettes-actions.c:47
+msgctxt "palettes-action"
 msgid "_New Palette"
 msgstr "�า�สี�_หม�"
 
-#: ../app/actions/palettes-actions.c:49
-msgid "New palette"
-msgstr "�า�สี�หม�"
+#: ../app/actions/palettes-actions.c:48
+msgctxt "palettes-action"
+msgid "Create a new palette"
+msgstr "สร�า��า�สี�หม�"
 
-#: ../app/actions/palettes-actions.c:54
+#: ../app/actions/palettes-actions.c:53
+msgctxt "palettes-action"
 msgid "_Import Palette..."
 msgstr "_�ำ���า�า�สี..."
 
-#: ../app/actions/palettes-actions.c:55
+#: ../app/actions/palettes-actions.c:54
+msgctxt "palettes-action"
 msgid "Import palette"
 msgstr "�ำ���า�า�สี"
 
-#: ../app/actions/palettes-actions.c:60
+#: ../app/actions/palettes-actions.c:59
+msgctxt "palettes-action"
 msgid "D_uplicate Palette"
 msgstr "_สำ��า�า�สี"
 
-#: ../app/actions/palettes-actions.c:61
-msgid "Duplicate palette"
-msgstr "สำ��า�า�สี"
+#: ../app/actions/palettes-actions.c:60
+msgctxt "palettes-action"
+msgid "Duplicate this palette"
+msgstr "สำ��า�า�สี�ี�"
 
-#: ../app/actions/palettes-actions.c:66
+#: ../app/actions/palettes-actions.c:65
+#, fuzzy
+#| msgid "_Merge Palettes..."
+msgctxt "palettes-action"
 msgid "_Merge Palettes..."
 msgstr "รวม_�า�สี..."
 
-#: ../app/actions/palettes-actions.c:67
+#: ../app/actions/palettes-actions.c:66
+#, fuzzy
+#| msgid "Merge palettes"
+msgctxt "palettes-action"
 msgid "Merge palettes"
 msgstr "รวม�า�สี"
 
-#: ../app/actions/palettes-actions.c:72
+#: ../app/actions/palettes-actions.c:71
 #, fuzzy
+msgctxt "palettes-action"
 msgid "Copy Palette _Location"
 msgstr "��ิ��า��ำ�ห���"
 
-#: ../app/actions/palettes-actions.c:73
+#: ../app/actions/palettes-actions.c:72
+#, fuzzy
+#| msgid "Copy palette file location to clipboard"
+msgctxt "palettes-action"
 msgid "Copy palette file location to clipboard"
 msgstr "�ั�ลอ��ำ�ห������ม�า�สี��ยั��ลิ��อร��"
 
-#: ../app/actions/palettes-actions.c:78
+#: ../app/actions/palettes-actions.c:77
+#, fuzzy
+#| msgid "_Delete Palette"
+msgctxt "palettes-action"
 msgid "_Delete Palette"
 msgstr "ล_��า�สี"
 
-#: ../app/actions/palettes-actions.c:79
-msgid "Delete palette"
+#: ../app/actions/palettes-actions.c:78
+#, fuzzy
+#| msgid "Delete palette"
+msgctxt "palettes-action"
+msgid "Delete this palette"
 msgstr "ล��า�สี"
 
-#: ../app/actions/palettes-actions.c:84
+#: ../app/actions/palettes-actions.c:83
+#, fuzzy
+#| msgid "_Refresh Palettes"
+msgctxt "palettes-action"
 msgid "_Refresh Palettes"
 msgstr "�ส_���า�สี�หม�"
 
-#: ../app/actions/palettes-actions.c:85
+#: ../app/actions/palettes-actions.c:84
+#, fuzzy
+#| msgid "Refresh palettes"
+msgctxt "palettes-action"
 msgid "Refresh palettes"
 msgstr "�ส���า�สี�หม�"
 
-#: ../app/actions/palettes-actions.c:93
+#: ../app/actions/palettes-actions.c:92
+#, fuzzy
+#| msgid "_Edit Palette..."
+msgctxt "palettes-action"
 msgid "_Edit Palette..."
-msgstr "����_��า�สี..."
+msgstr "�_�����า�สี..."
 
-#: ../app/actions/palettes-actions.c:94
+#: ../app/actions/palettes-actions.c:93
+#, fuzzy
+#| msgid "Edit palette"
+msgctxt "palettes-action"
 msgid "Edit palette"
 msgstr "������า�สี"
 
-#: ../app/actions/palettes-commands.c:74
+#: ../app/actions/palettes-commands.c:72
 msgid "Merge Palette"
 msgstr "รวม�า�สี"
 
-#: ../app/actions/palettes-commands.c:78
+#: ../app/actions/palettes-commands.c:76
 msgid "Enter a name for the merged palette"
 msgstr "��อ��ื�อ�อ��า�สี�ี�รวม�ล�ว"
 
-#: ../app/actions/patterns-actions.c:43
+#: ../app/actions/patterns-actions.c:42
+#, fuzzy
+#| msgid "Patterns Menu"
+msgctxt "patterns-action"
 msgid "Patterns Menu"
 msgstr "ราย�าร���ลาย"
 
-#: ../app/actions/patterns-actions.c:47
+#: ../app/actions/patterns-actions.c:46
 #, fuzzy
+msgctxt "patterns-action"
 msgid "_Open Pattern as Image"
 msgstr "_ยุ�รวมภา�"
 
-#: ../app/actions/patterns-actions.c:48
+#: ../app/actions/patterns-actions.c:47
 #, fuzzy
-msgid "Open pattern as image"
-msgstr "��ิ��รอ��าร�ลือ����ลาย"
+msgctxt "patterns-action"
+msgid "Open this pattern as an image"
+msgstr "��ิ��ล�อ�����อ��ลือ����ลาย"
 
-#: ../app/actions/patterns-actions.c:53
+#: ../app/actions/patterns-actions.c:52
+#, fuzzy
+#| msgid "_New Pattern"
+msgctxt "patterns-action"
 msgid "_New Pattern"
 msgstr "���ลาย�_หม�"
 
-#: ../app/actions/patterns-actions.c:54
-msgid "New pattern"
-msgstr "���ลาย�หม�"
+#: ../app/actions/patterns-actions.c:53
+#, fuzzy
+#| msgid "Create a new template"
+msgctxt "patterns-action"
+msgid "Create a new pattern"
+msgstr "สร�า���า��า��ม�����หม�"
 
-#: ../app/actions/patterns-actions.c:59
+#: ../app/actions/patterns-actions.c:58
+#, fuzzy
+#| msgid "D_uplicate Pattern"
+msgctxt "patterns-action"
 msgid "D_uplicate Pattern"
 msgstr "สำ�_�า���ลาย"
 
-#: ../app/actions/patterns-actions.c:60
-msgid "Duplicate pattern"
+#: ../app/actions/patterns-actions.c:59
+#, fuzzy
+#| msgid "Duplicate pattern"
+msgctxt "patterns-action"
+msgid "Duplicate this pattern"
 msgstr "สำ��า���ลาย"
 
-#: ../app/actions/patterns-actions.c:65
+#: ../app/actions/patterns-actions.c:64
 #, fuzzy
+msgctxt "patterns-action"
 msgid "Copy Pattern _Location"
 msgstr "��ิ��า��ำ�ห���"
 
-#: ../app/actions/patterns-actions.c:66
+#: ../app/actions/patterns-actions.c:65
+#, fuzzy
+#| msgid "Copy pattern file location to clipboard"
+msgctxt "patterns-action"
 msgid "Copy pattern file location to clipboard"
 msgstr "�ั�ลอ��ำ�ห������ม���ลาย��ยั��ลิ��อร��"
 
-#: ../app/actions/patterns-actions.c:71
+#: ../app/actions/patterns-actions.c:70
 #, fuzzy
+msgctxt "patterns-action"
 msgid "_Delete Pattern"
 msgstr "_ล����ลาย..."
 
-#: ../app/actions/patterns-actions.c:72
-msgid "Delete pattern"
+#: ../app/actions/patterns-actions.c:71
+#, fuzzy
+#| msgid "Delete pattern"
+msgctxt "patterns-action"
+msgid "Delete this pattern"
 msgstr "ล����ลาย"
 
-#: ../app/actions/patterns-actions.c:77
+#: ../app/actions/patterns-actions.c:76
+#, fuzzy
+#| msgid "_Refresh Patterns"
+msgctxt "patterns-action"
 msgid "_Refresh Patterns"
 msgstr "�ส_�����ลาย�หม�"
 
-#: ../app/actions/patterns-actions.c:78
+#: ../app/actions/patterns-actions.c:77
+#, fuzzy
+#| msgid "Refresh patterns"
+msgctxt "patterns-action"
 msgid "Refresh patterns"
 msgstr "�ส�����ลาย�หม�"
 
-#: ../app/actions/patterns-actions.c:86
+#: ../app/actions/patterns-actions.c:85
+#, fuzzy
+#| msgid "_Edit Pattern..."
+msgctxt "patterns-action"
 msgid "_Edit Pattern..."
-msgstr "����_����ลาย..."
+msgstr "�_�������ลาย..."
 
-#: ../app/actions/patterns-actions.c:87
+#: ../app/actions/patterns-actions.c:86
+#, fuzzy
+#| msgid "Edit pattern"
+msgctxt "patterns-action"
 msgid "Edit pattern"
 msgstr "��������ลาย"
 
-#: ../app/actions/plug-in-actions.c:83
+#: ../app/actions/plug-in-actions.c:84
+#, fuzzy
+#| msgid "Filte_rs"
+msgctxt "plug-in-action"
 msgid "Filte_rs"
 msgstr "�ิล�_�อร�"
 
-#: ../app/actions/plug-in-actions.c:84
+#: ../app/actions/plug-in-actions.c:86
 #, fuzzy
+msgctxt "plug-in-action"
 msgid "Recently Used"
 msgstr "��ิ���ู������"
 
-#: ../app/actions/plug-in-actions.c:85
+#: ../app/actions/plug-in-actions.c:88
+#, fuzzy
+#| msgid "_Blur"
+msgctxt "plug-in-action"
 msgid "_Blur"
 msgstr "_มัว"
 
-#: ../app/actions/plug-in-actions.c:86
+#: ../app/actions/plug-in-actions.c:90
+#, fuzzy
+#| msgid "_Noise"
+msgctxt "plug-in-action"
 msgid "_Noise"
 msgstr "_สิ��ร��ว�"
 
-#: ../app/actions/plug-in-actions.c:87
+#: ../app/actions/plug-in-actions.c:92
+#, fuzzy
+#| msgid "Edge-De_tect"
+msgctxt "plug-in-action"
 msgid "Edge-De_tect"
 msgstr "_���หา�อ�"
 
-#: ../app/actions/plug-in-actions.c:88
+#: ../app/actions/plug-in-actions.c:94
+msgctxt "plug-in-action"
 msgid "En_hance"
 msgstr ""
 
-#: ../app/actions/plug-in-actions.c:89
+#: ../app/actions/plug-in-actions.c:96
+#, fuzzy
+#| msgid "C_ombine"
+msgctxt "plug-in-action"
 msgid "C_ombine"
 msgstr "ร_วม�ั�"
 
-#: ../app/actions/plug-in-actions.c:90
+#: ../app/actions/plug-in-actions.c:98
+#, fuzzy
+#| msgid "_Generic"
+msgctxt "plug-in-action"
 msgid "_Generic"
 msgstr "_�ั�ว��"
 
-#: ../app/actions/plug-in-actions.c:91
+#: ../app/actions/plug-in-actions.c:100
+#, fuzzy
+#| msgid "_Light and Shadow"
+msgctxt "plug-in-action"
 msgid "_Light and Shadow"
 msgstr "�_ส��ละ��า"
 
-#: ../app/actions/plug-in-actions.c:92
+#: ../app/actions/plug-in-actions.c:102
+#, fuzzy
+#| msgid "_Distorts"
+msgctxt "plug-in-action"
 msgid "_Distorts"
 msgstr "_�ิ���ี�ยว"
 
-#: ../app/actions/plug-in-actions.c:93
+#: ../app/actions/plug-in-actions.c:104
+msgctxt "plug-in-action"
 msgid "_Artistic"
 msgstr ""
 
-#: ../app/actions/plug-in-actions.c:95
-msgid "_Render"
+#: ../app/actions/plug-in-actions.c:106
+msgctxt "plug-in-action"
+msgid "_Decor"
 msgstr ""
 
-#: ../app/actions/plug-in-actions.c:96
+#: ../app/actions/plug-in-actions.c:108
+#, fuzzy
+msgctxt "plug-in-action"
+msgid "_Map"
+msgstr "�_���ั�"
+
+#: ../app/actions/plug-in-actions.c:110
+#, fuzzy
+#| msgid "_Redo"
+msgctxt "plug-in-action"
+msgid "_Render"
+msgstr "_�ำ��ำ"
+
+#: ../app/actions/plug-in-actions.c:112
+#, fuzzy
+#| msgid "_Clouds"
+msgctxt "plug-in-action"
 msgid "_Clouds"
 msgstr "�_ม�"
 
-#: ../app/actions/plug-in-actions.c:97
+#: ../app/actions/plug-in-actions.c:114
+#, fuzzy
+#| msgid "_Desaturate"
+msgctxt "plug-in-action"
 msgid "_Nature"
-msgstr ""
+msgstr "_�ึ�สีออ�"
+
+#: ../app/actions/plug-in-actions.c:116
+#, fuzzy
+#| msgid "_Pattern"
+msgctxt "plug-in-action"
+msgid "_Pattern"
+msgstr "�_��ลาย"
 
-#: ../app/actions/plug-in-actions.c:99
+#: ../app/actions/plug-in-actions.c:118
+msgctxt "plug-in-action"
 msgid "_Web"
 msgstr ""
 
-#: ../app/actions/plug-in-actions.c:100
+#: ../app/actions/plug-in-actions.c:120
+#, fuzzy
+#| msgid "An_imation"
+msgctxt "plug-in-action"
 msgid "An_imation"
 msgstr "�าร��ลื�อ��_หว"
 
-#: ../app/actions/plug-in-actions.c:103
+#: ../app/actions/plug-in-actions.c:123
 #, fuzzy
+msgctxt "plug-in-action"
 msgid "Reset all _Filters"
 msgstr "�ั����า�ิล��อร��หม��ั��หม�"
 
-#: ../app/actions/plug-in-actions.c:104
-msgid "Set all plug-in to their default settings"
+#: ../app/actions/plug-in-actions.c:124
+#, fuzzy
+#| msgid "Set all plug-in to their default settings"
+msgctxt "plug-in-action"
+msgid "Reset all plug-ins to their default settings"
 msgstr "�ั����า�ห���ร��รม�สริม�ุ���ร��รม�ลั�������า�ริยาย"
 
-#: ../app/actions/plug-in-actions.c:112
+#: ../app/actions/plug-in-actions.c:132
 #, fuzzy
+msgctxt "plug-in-action"
 msgid "Re_peat Last"
 msgstr "�ว�ราย�ารล�าสุ�"
 
-#: ../app/actions/plug-in-actions.c:113
+#: ../app/actions/plug-in-actions.c:134
+#, fuzzy
+#| msgid "Rerun the last used plug-in using the same settings"
+msgctxt "plug-in-action"
 msgid "Rerun the last used plug-in using the same settings"
 msgstr "����า���ร��รม�สริม�ี����ล�าสุ�อี��รั����วย��า�ี��ั���ว���ิม"
 
-#: ../app/actions/plug-in-actions.c:118
+#: ../app/actions/plug-in-actions.c:139
 #, fuzzy
+msgctxt "plug-in-action"
 msgid "R_e-Show Last"
 msgstr "�ส��ราย�ารล�าสุ�อึ�"
 
-#: ../app/actions/plug-in-actions.c:119
+#: ../app/actions/plug-in-actions.c:140
+#, fuzzy
+#| msgid "Show the last used plug-in dialog again"
+msgctxt "plug-in-action"
 msgid "Show the last used plug-in dialog again"
 msgstr "�ส���ล�อ�����อ��อ���ร��รม�ลริม�ี����ล�าสุ�อี��รั��"
 
-#: ../app/actions/plug-in-actions.c:527
+#: ../app/actions/plug-in-actions.c:531
 #, c-format
 msgid "Re_peat \"%s\""
 msgstr "�ว� \"%s\""
 
-#: ../app/actions/plug-in-actions.c:528
+#: ../app/actions/plug-in-actions.c:532
 #, fuzzy, c-format
 msgid "R_e-Show \"%s\""
 msgstr "�_ส�� \"%s\" อี��รั��"
 
-#: ../app/actions/plug-in-actions.c:541
+#: ../app/actions/plug-in-actions.c:548
 msgid "Repeat Last"
 msgstr "�ว�ราย�ารล�าสุ�"
 
-#: ../app/actions/plug-in-actions.c:543
+#: ../app/actions/plug-in-actions.c:550
 msgid "Re-Show Last"
 msgstr "�ส��ราย�ารล�าสุ�อึ�"
 
-#: ../app/actions/plug-in-commands.c:231
+#: ../app/actions/plug-in-commands.c:262
 msgid "Reset all Filters"
 msgstr "�ั����า�ิล��อร��หม��ั��หม�"
 
-#: ../app/actions/plug-in-commands.c:250
+#: ../app/actions/plug-in-commands.c:281
 msgid "Do you really want to reset all filters to default values?"
 msgstr "�ุ���อ��าร�ี��ะ�ั����า�ิล��อร�������า�ริยาย���หรือ�ม�?"
 
-#: ../app/actions/quick-mask-actions.c:42
+#: ../app/actions/quick-mask-actions.c:43
+#, fuzzy
+#| msgid "Quick Mask Menu"
+msgctxt "quick-mask-action"
 msgid "Quick Mask Menu"
 msgstr "ราย�ารห��า�า���ว�"
 
-#: ../app/actions/quick-mask-actions.c:46
+#: ../app/actions/quick-mask-actions.c:47
+#, fuzzy
+#| msgid "_Configure Color and Opacity..."
+msgctxt "quick-mask-action"
 msgid "_Configure Color and Opacity..."
 msgstr "_�ำห����าสี�ละ�วาม�ึ��ส�..."
 
-#: ../app/actions/quick-mask-actions.c:54
+#: ../app/actions/quick-mask-actions.c:55
+#, fuzzy
+#| msgid "Toggle _Quick Mask"
+msgctxt "quick-mask-action"
 msgid "Toggle _Quick Mask"
 msgstr "����ลี�ย�_ห��า�า���ว�"
 
-#: ../app/actions/quick-mask-actions.c:54
-#: ../app/display/gimpdisplayshell.c:975
-msgid "Toggle Quick Mask"
+#: ../app/actions/quick-mask-actions.c:56
+#, fuzzy
+#| msgid "Toggle Quick Mask"
+msgctxt "quick-mask-action"
+msgid "Toggle Quick Mask on/off"
 msgstr "สลั�ห��า�า���ว�"
 
-#: ../app/actions/quick-mask-actions.c:63
+#: ../app/actions/quick-mask-actions.c:65
+#, fuzzy
+#| msgid "Mask _Selected Areas"
+msgctxt "quick-mask-action"
 msgid "Mask _Selected Areas"
 msgstr "สวมห��า_�า��ื���ี��ี��ู��ลือ�"
 
-#: ../app/actions/quick-mask-actions.c:68
+#: ../app/actions/quick-mask-actions.c:70
+#, fuzzy
+#| msgid "Mask _Unselected Areas"
+msgctxt "quick-mask-action"
 msgid "Mask _Unselected Areas"
 msgstr "สวมห��า�า�_�ื���ี��ี��ม�����ลือ�"
 
@@ -3205,609 +4919,1047 @@ msgstr "�����สีห��า�า���ว�"
 msgid "_Mask opacity:"
 msgstr "�วาม�ึ�ห��า�า�"
 
-#: ../app/actions/sample-point-editor-actions.c:40
+#: ../app/actions/sample-points-actions.c:39
 #, fuzzy
+msgctxt "sample-points-action"
 msgid "Sample Point Menu"
-msgstr "ราย�าร�ัว������า�สี"
+msgstr "ราย�าร��รื�อ�มือ������า�สี"
+
+#: ../app/actions/sample-points-actions.c:46
+#, fuzzy
+#| msgid "_Sample Merged"
+msgctxt "sample-points-action"
+msgid "_Sample Merged"
+msgstr "_ภา�รวม"
+
+#: ../app/actions/sample-points-actions.c:48
+#, fuzzy
+#| msgid "Base selection on all visible layers"
+msgctxt "sample-points-action"
+msgid "Use the composite color of all visible layers"
+msgstr "�ลือ��า��ุ��ั���า��ี�มอ��ห���"
 
 #: ../app/actions/select-actions.c:44
+#, fuzzy
+#| msgid "Selection Editor Menu"
+msgctxt "select-action"
 msgid "Selection Editor Menu"
-msgstr "ราย�าร�ัว������าร�ลือ��ื���ี�"
+msgstr "ราย�าร��รื�อ�มือ������าร�ลือ��ื���ี�"
 
 #: ../app/actions/select-actions.c:47
+#, fuzzy
+#| msgid "_Select"
+msgctxt "select-action"
 msgid "_Select"
 msgstr "�_ลือ�"
 
 #: ../app/actions/select-actions.c:50
 #, fuzzy
-msgid "select|_All"
-msgstr "�ลือ�_�ั��หม�"
+#| msgid "_All"
+msgctxt "select-action"
+msgid "_All"
+msgstr "_�ั��หม�"
 
 #: ../app/actions/select-actions.c:51
 #, fuzzy
+msgctxt "select-action"
 msgid "Select everything"
 msgstr "�ลือ��ุ�รู����"
 
 #: ../app/actions/select-actions.c:56
-#, fuzzy
-msgid "select|_None"
-msgstr "�ม�มี�าร�ลือ�"
+msgctxt "select-action"
+msgid "_None"
+msgstr "�_ม��ลือ�"
 
 #: ../app/actions/select-actions.c:57
 #, fuzzy
+msgctxt "select-action"
 msgid "Dismiss the selection"
 msgstr "�ื���ี��ลือ��ั��หม�"
 
 #: ../app/actions/select-actions.c:62
+msgctxt "select-action"
 msgid "_Invert"
 msgstr "_�ลั�"
 
 #: ../app/actions/select-actions.c:63
 #, fuzzy
+msgctxt "select-action"
 msgid "Invert the selection"
 msgstr "�ลั��าร�ลือ�"
 
 #: ../app/actions/select-actions.c:68
+#, fuzzy
+#| msgid "_Float"
+msgctxt "select-action"
 msgid "_Float"
 msgstr "ลอ_ย�ัว"
 
 #: ../app/actions/select-actions.c:69
 #, fuzzy
+msgctxt "select-action"
 msgid "Create a floating selection"
 msgstr "�อา�ื���ี��ลือ�ลอย�ัวออ�"
 
 #: ../app/actions/select-actions.c:74
+#, fuzzy
+#| msgid "Fea_ther..."
+msgctxt "select-action"
 msgid "Fea_ther..."
 msgstr "�ำ�ห�_�ุ��..."
 
-#: ../app/actions/select-actions.c:75
+#: ../app/actions/select-actions.c:76
 #, fuzzy
+msgctxt "select-action"
 msgid "Blur the selection border so that it fades out smoothly"
 msgstr "�ำ�ห��อ��ื���ี��าร�ลือ�มัว �ึ���ำ�ห���ิ��าร�า�ออ�อย�า��ุ�ม�ว�"
 
-#: ../app/actions/select-actions.c:80
+#: ../app/actions/select-actions.c:81
+#, fuzzy
+#| msgid "_Sharpen"
+msgctxt "select-action"
 msgid "_Sharpen"
 msgstr "�ำ�ห�_�ั�"
 
-#: ../app/actions/select-actions.c:81
+#: ../app/actions/select-actions.c:82
 #, fuzzy
+msgctxt "select-action"
 msgid "Remove fuzzyness from the selection"
 msgstr "�อา�ื���ี��ลือ�ลอย�ัวออ�"
 
-#: ../app/actions/select-actions.c:86
+#: ../app/actions/select-actions.c:87
+#, fuzzy
+#| msgid "S_hrink..."
+msgctxt "select-action"
 msgid "S_hrink..."
 msgstr "_ห�..."
 
-#: ../app/actions/select-actions.c:87
+#: ../app/actions/select-actions.c:88
 #, fuzzy
+msgctxt "select-action"
 msgid "Contract the selection"
 msgstr "�ื���ี��ลือ��ี���ำ_�ั�"
 
-#: ../app/actions/select-actions.c:92
+#: ../app/actions/select-actions.c:93
+#, fuzzy
+#| msgid "_Grow..."
+msgctxt "select-action"
 msgid "_Grow..."
 msgstr "_�ยาย..."
 
-#: ../app/actions/select-actions.c:93
+#: ../app/actions/select-actions.c:94
 #, fuzzy
+msgctxt "select-action"
 msgid "Enlarge the selection"
 msgstr "ลอย�ัว�ื���ี��ลือ�"
 
-#: ../app/actions/select-actions.c:98
+#: ../app/actions/select-actions.c:99
+msgctxt "select-action"
 msgid "Bo_rder..."
 msgstr "_�อ�..."
 
-#: ../app/actions/select-actions.c:99
+#: ../app/actions/select-actions.c:100
 #, fuzzy
+msgctxt "select-action"
 msgid "Replace the selection by its border"
 msgstr "����ี��ี���ี��ี��ลือ�อยู�"
 
-#: ../app/actions/select-actions.c:104
+#: ../app/actions/select-actions.c:105
+#, fuzzy
+#| msgid "Save to _Channel"
+msgctxt "select-action"
 msgid "Save to _Channel"
 msgstr "�ั��ึ�����_�����ล"
 
-#: ../app/actions/select-actions.c:105
+#: ../app/actions/select-actions.c:106
 #, fuzzy
+msgctxt "select-action"
 msgid "Save the selection to a channel"
 msgstr "�ั��ี��ี���ี��าร�ลือ����������ล"
 
-#: ../app/actions/select-actions.c:110
+#: ../app/actions/select-actions.c:111
+#, fuzzy
+#| msgid "_Stroke Selection..."
+msgctxt "select-action"
 msgid "_Stroke Selection..."
 msgstr "_�ี�ส���าม�อ��าร�ลือ�..."
 
-#: ../app/actions/select-actions.c:111
+#: ../app/actions/select-actions.c:112
 #, fuzzy
+msgctxt "select-action"
 msgid "Paint along the selection outline"
 msgstr "��ล��ส���า������ี���ี��ลือ�"
 
-#: ../app/actions/select-actions.c:116
+#: ../app/actions/select-actions.c:117
+#, fuzzy
+#| msgid "_Stroke Selection"
+msgctxt "select-action"
 msgid "_Stroke Selection"
 msgstr "_�ี�ส���าม�อ��าร�ลือ�"
 
-#: ../app/actions/select-actions.c:117
+#: ../app/actions/select-actions.c:118
 #, fuzzy
+msgctxt "select-action"
 msgid "Stroke the selection with last used values"
 msgstr "�ี�ส���าม�อ��าร�ลือ���วย��าล�าสุ�"
 
-#: ../app/actions/select-commands.c:137 ../app/core/gimpselection.c:166
+#: ../app/actions/select-commands.c:156 ../app/core/gimpselection.c:171
 msgid "Feather Selection"
 msgstr "�ุ���อ��ื���ี��าร�ลือ�"
 
-#: ../app/actions/select-commands.c:141
+#: ../app/actions/select-commands.c:160
 msgid "Feather selection by"
 msgstr "�ุ���อ��ื���ี��าร�ลือ���ย"
 
-#: ../app/actions/select-commands.c:172 ../app/core/gimpselection.c:173
+#: ../app/actions/select-commands.c:197 ../app/core/gimpselection.c:178
 msgid "Shrink Selection"
 msgstr "ห��ื���ี��าร�ลือ�ล�"
 
-#: ../app/actions/select-commands.c:176
+#: ../app/actions/select-commands.c:201
 msgid "Shrink selection by"
 msgstr "ห��ื���ี��าร�ลือ�ล���ย"
 
-#: ../app/actions/select-commands.c:185
+#: ../app/actions/select-commands.c:209
 #, fuzzy
 msgid "_Shrink from image border"
 msgstr "ห�ล��า��อ�ภา�"
 
-#: ../app/actions/select-commands.c:206 ../app/core/gimpselection.c:172
+#: ../app/actions/select-commands.c:237 ../app/core/gimpselection.c:177
 msgid "Grow Selection"
 msgstr "�ยาย�ื���ี��าร�ลือ�"
 
-#: ../app/actions/select-commands.c:210
+#: ../app/actions/select-commands.c:241
 msgid "Grow selection by"
 msgstr "�ยาย�ื���ี��าร�ลือ���ย"
 
-#: ../app/actions/select-commands.c:230 ../app/core/gimpselection.c:171
+#: ../app/actions/select-commands.c:267 ../app/core/gimpselection.c:176
 msgid "Border Selection"
 msgstr "��ิม�อ��ื���ี��ลือ�"
 
-#: ../app/actions/select-commands.c:234
+#: ../app/actions/select-commands.c:271
 msgid "Border selection by"
 msgstr "��ิม�อ��ื���ี��ลือ���ย"
 
-#: ../app/actions/select-commands.c:243
+#. Feather button
+#: ../app/actions/select-commands.c:280
 #, fuzzy
 msgid "_Feather border"
 msgstr "�อ��ุ��"
 
-#: ../app/actions/select-commands.c:289 ../app/actions/select-commands.c:316
-#: ../app/actions/vectors-commands.c:359 ../app/actions/vectors-commands.c:387
-#: ../app/dialogs/stroke-dialog.c:282
+#. Edge lock button
+#: ../app/actions/select-commands.c:293
+#, fuzzy
+#| msgid "No selection to stroke."
+msgid "_Lock selection to image edges"
+msgstr "�ม�มี�าร�ลือ��ื���ี����าร�ี�ส��"
+
+#: ../app/actions/select-commands.c:343 ../app/actions/select-commands.c:376
+#: ../app/actions/vectors-commands.c:391 ../app/actions/vectors-commands.c:425
+#: ../app/dialogs/stroke-dialog.c:289
 msgid "There is no active layer or channel to stroke to."
 msgstr "�ม����าร�ลือ��ั���า�หรือ�����ล�ี��ะ�ี�ส��"
 
-#: ../app/actions/select-commands.c:295 ../app/core/gimpselection.c:150
+#: ../app/actions/select-commands.c:349 ../app/core/gimpselection.c:155
 msgid "Stroke Selection"
 msgstr "�ี�ส���าม�อ��ื���ี��าร�ลือ�"
 
-#: ../app/actions/templates-actions.c:42
+#: ../app/actions/templates-actions.c:41
+#, fuzzy
+#| msgid "Templates Menu"
+msgctxt "templates-action"
 msgid "Templates Menu"
 msgstr "ราย�าร��า��า��ม����"
 
-#: ../app/actions/templates-actions.c:46
-msgid "_Create Image from Template..."
+#: ../app/actions/templates-actions.c:45
+#, fuzzy
+#| msgid "_Create Image from Template..."
+msgctxt "templates-action"
+msgid "_Create Image from Template"
 msgstr "_สร�า�ภา��า��ม�����า�..."
 
-#: ../app/actions/templates-actions.c:47
+#: ../app/actions/templates-actions.c:46
+#, fuzzy
+#| msgid "Create a new image from the selected template"
+msgctxt "templates-action"
 msgid "Create a new image from the selected template"
 msgstr "สร�า�ภา��หม��า��า��ม�����ี��ลือ�"
 
-#: ../app/actions/templates-actions.c:52
+#: ../app/actions/templates-actions.c:51
+msgctxt "templates-action"
 msgid "_New Template..."
-msgstr "_��า��า��ม�����หม�..."
+msgstr "�_ม�����หม�..."
 
-#: ../app/actions/templates-actions.c:53
+#: ../app/actions/templates-actions.c:52
+msgctxt "templates-action"
 msgid "Create a new template"
-msgstr "สร�า���า��า��ม�����หม�"
+msgstr "สร�า��ม�����หม�"
 
-#: ../app/actions/templates-actions.c:58
+#: ../app/actions/templates-actions.c:57
+msgctxt "templates-action"
 msgid "D_uplicate Template..."
-msgstr "_สำ��า��า��า��ม����..."
+msgstr "_สำ��า�ม����..."
 
-#: ../app/actions/templates-actions.c:59
-msgid "Duplicate the selected template"
-msgstr "สำ��า��า��า��ม�����ี��ลือ�"
+#: ../app/actions/templates-actions.c:58
+msgctxt "templates-action"
+msgid "Duplicate this template"
+msgstr "สำ��า�ม�����ี�"
 
-#: ../app/actions/templates-actions.c:64
+#: ../app/actions/templates-actions.c:63
+msgctxt "templates-action"
 msgid "_Edit Template..."
-msgstr "�_������า��า��ม����..."
+msgstr "�_�����ม����..."
 
-#: ../app/actions/templates-actions.c:65
-msgid "Edit the selected template"
-msgstr "�������า��า��ม�����ี��ลือ�"
+#: ../app/actions/templates-actions.c:64
+msgctxt "templates-action"
+msgid "Edit this template"
+msgstr "������ม�����ี�"
 
-#: ../app/actions/templates-actions.c:70
+#: ../app/actions/templates-actions.c:69
+msgctxt "templates-action"
 msgid "_Delete Template"
-msgstr "_ล���า��า��ม����"
+msgstr "_ล��ม����"
 
-#: ../app/actions/templates-actions.c:71
-msgid "Delete the selected template"
-msgstr "ล���า��า��ม�����ี��ลือ�"
+#: ../app/actions/templates-actions.c:70
+msgctxt "templates-action"
+msgid "Delete this template"
+msgstr "ล��ม�����ี�"
 
-#: ../app/actions/templates-commands.c:122
+#: ../app/actions/templates-commands.c:111
 msgid "New Template"
 msgstr "��า��า��ม�����หม�"
 
-#: ../app/actions/templates-commands.c:125
+#: ../app/actions/templates-commands.c:114
 msgid "Create a New Template"
 msgstr "สร�า���า��า��ม�����หม�"
 
-#: ../app/actions/templates-commands.c:184
-#: ../app/actions/templates-commands.c:187
+#: ../app/actions/templates-commands.c:174
+#: ../app/actions/templates-commands.c:177
 msgid "Edit Template"
 msgstr "�������า��า��ม����"
 
-#: ../app/actions/templates-commands.c:223
+#: ../app/actions/templates-commands.c:212
 msgid "Delete Template"
 msgstr "ล���า��า��ม����"
 
-#: ../app/actions/templates-commands.c:247
+#: ../app/actions/templates-commands.c:238
 #, c-format
 msgid ""
 "Are you sure you want to delete template '%s' from the list and from disk?"
 msgstr "�ุ������หรือ�ม��ี�ะล���า��า��ม���� '%s' ออ��า�ราย�าร�ละ�ิส��?"
 
-#: ../app/actions/text-editor-actions.c:44
+#: ../app/actions/text-editor-actions.c:43
+msgctxt "text-editor-action"
 msgid "Open"
 msgstr "��ิ�"
 
-#: ../app/actions/text-editor-actions.c:45
+#: ../app/actions/text-editor-actions.c:44
+msgctxt "text-editor-action"
 msgid "Load text from file"
 msgstr "�หล���อ�วาม�า����ม"
 
-#: ../app/actions/text-editor-actions.c:50 ../app/core/gimp-edit.c:425
+#: ../app/actions/text-editor-actions.c:49
+msgctxt "text-editor-action"
 msgid "Clear"
-msgstr "ล�ล�า�"
+msgstr "ล�า�"
 
-#: ../app/actions/text-editor-actions.c:51
+#: ../app/actions/text-editor-actions.c:50
+msgctxt "text-editor-action"
 msgid "Clear all text"
-msgstr "ล�ล�า���อ�วาม�ั��หม�"
+msgstr "ล�า���อ�วาม�ั��หม�"
 
-#: ../app/actions/text-editor-actions.c:59
+#: ../app/actions/text-editor-actions.c:58
+msgctxt "text-editor-action"
 msgid "LTR"
 msgstr "LTR"
 
-#: ../app/actions/text-editor-actions.c:60 ../app/text/text-enums.c:51
+#: ../app/actions/text-editor-actions.c:59
+msgctxt "text-editor-action"
 msgid "From left to right"
 msgstr "�า���าย���วา"
 
-#: ../app/actions/text-editor-actions.c:65
+#: ../app/actions/text-editor-actions.c:64
+msgctxt "text-editor-action"
 msgid "RTL"
 msgstr "RTL"
 
-#: ../app/actions/text-editor-actions.c:66 ../app/text/text-enums.c:52
+#: ../app/actions/text-editor-actions.c:65
+msgctxt "text-editor-action"
 msgid "From right to left"
 msgstr "�า��วา����าย"
 
-#: ../app/actions/text-editor-commands.c:60
+#: ../app/actions/text-editor-commands.c:62
+#: ../app/actions/text-tool-commands.c:117
 msgid "Open Text File (UTF-8)"
 msgstr "��ิ����ม��อ�วาม��� (UTF-8)"
 
-#: ../app/actions/text-editor-commands.c:138
-#: ../app/config/gimpconfig-file.c:57 ../app/core/gimpbrush-load.c:115
-#: ../app/core/gimpbrush-load.c:395 ../app/core/gimpbrushgenerated.c:562
-#: ../app/core/gimpbrushpipe.c:314 ../app/core/gimpgradient-load.c:60
-#: ../app/core/gimppalette.c:324 ../app/core/gimppattern.c:265
-#: ../app/tools/gimpimagemaptool.c:585 ../app/xcf/xcf.c:319
+#: ../app/actions/text-editor-commands.c:143
+#: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58
+#: ../app/core/gimpbrush-load.c:140 ../app/core/gimpbrush-load.c:422
+#: ../app/core/gimpbrushgenerated-load.c:73
+#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54
+#: ../app/core/gimpgradient-load.c:62 ../app/core/gimppalette-load.c:76
+#: ../app/core/gimppalette-load.c:273 ../app/core/gimppalette-load.c:319
+#: ../app/core/gimppalette-load.c:376 ../app/core/gimppalette-load.c:466
+#: ../app/core/gimppalette-load.c:633 ../app/core/gimppattern-load.c:76
+#: ../app/tools/gimpcurvestool.c:637 ../app/tools/gimplevelstool.c:747
+#: ../app/xcf/xcf.c:328
 #, c-format
 msgid "Could not open '%s' for reading: %s"
 msgstr "�ม�สามาร���ิ� '%s' ��ื�ออ�า�: %s"
 
-#: ../app/actions/tool-options-actions.c:56
-msgid "Tool Options Menu"
-msgstr "ราย�าร�ัว�ลือ���รื�อ�มือ"
+#: ../app/actions/text-tool-actions.c:49
+msgctxt "text-tool-action"
+msgid "Text Tool Menu"
+msgstr "�ม�ู��รือ�มือ��อ�วาม"
+
+#: ../app/actions/text-tool-actions.c:53
+msgctxt "text-tool-action"
+msgid "Input _Methods"
+msgstr ""
+
+#: ../app/actions/text-tool-actions.c:57
+msgctxt "text-tool-action"
+msgid "Cu_t"
+msgstr "�ั_�"
+
+#: ../app/actions/text-tool-actions.c:62
+msgctxt "text-tool-action"
+msgid "_Copy"
+msgstr "�ั�_ลอ�"
+
+#: ../app/actions/text-tool-actions.c:67
+msgctxt "text-tool-action"
+msgid "_Paste"
+msgstr "�_�ะ"
+
+#: ../app/actions/text-tool-actions.c:72
+msgctxt "text-tool-action"
+msgid "_Delete"
+msgstr "_ล�"
 
-#: ../app/actions/tool-options-actions.c:60
+#: ../app/actions/text-tool-actions.c:77
+msgctxt "text-tool-action"
+msgid "_Open text file..."
+msgstr "_��ิ����ม��อ�วาม..."
+
+#: ../app/actions/text-tool-actions.c:82
+msgctxt "text-tool-action"
+msgid "Cl_ear"
+msgstr "_ล�า�"
+
+#: ../app/actions/text-tool-actions.c:83
+msgctxt "text-tool-action"
+msgid "Clear all text"
+msgstr "ล�า���อ�วาม�ั��หม�"
+
+#: ../app/actions/text-tool-actions.c:88
+#, fuzzy
+msgctxt "text-tool-action"
+msgid "_Path from Text"
+msgstr "สร�า��ส���า��า�อั�ษร"
+
+#: ../app/actions/text-tool-actions.c:90
 #, fuzzy
+msgctxt "text-tool-action"
+msgid "Create a path from the outlines of the current text"
+msgstr "สร�า��ส���า��า�อั�ษร"
+
+#: ../app/actions/text-tool-actions.c:95
+#, fuzzy
+msgctxt "text-tool-action"
+msgid "Text _along Path"
+msgstr "�����ส��_�า�"
+
+#: ../app/actions/text-tool-actions.c:97
+#, fuzzy
+#| msgid "Warp this layer's text along the current path"
+msgctxt "text-tool-action"
+msgid "Bend the text along the currently active path"
+msgstr "วา���อ�วาม�อ��ั���า��ี��าม�ส���า�"
+
+#: ../app/actions/text-tool-actions.c:105
+msgctxt "text-tool-action"
+msgid "From left to right"
+msgstr "�า���าย���วา"
+
+#: ../app/actions/text-tool-actions.c:110
+msgctxt "text-tool-action"
+msgid "From right to left"
+msgstr "�า��วา����าย"
+
+#: ../app/actions/tool-options-actions.c:55
+msgctxt "tool-options-action"
+msgid "Tool Options Menu"
+msgstr "�ม�ู�ัว�ลือ��อ���รื�อ�มือ"
+
+#: ../app/actions/tool-options-actions.c:59
+msgctxt "tool-options-action"
 msgid "_Save Options To"
 msgstr "�ั��ึ�_�ัว�ลือ���ยั�"
 
-#: ../app/actions/tool-options-actions.c:64
+#: ../app/actions/tool-options-actions.c:63
 #, fuzzy
+msgctxt "tool-options-action"
 msgid "_Restore Options From"
 msgstr "�_รีย��ื��ัว�ลือ��า�"
 
-#: ../app/actions/tool-options-actions.c:68
+#: ../app/actions/tool-options-actions.c:67
+#, fuzzy
+#| msgid "Re_name Saved Options"
+msgctxt "tool-options-action"
 msgid "Re_name Saved Options"
 msgstr "�_�ลี�ย��ื�อ�ัว�ลือ��ี��ั��ึ�"
 
-#: ../app/actions/tool-options-actions.c:72
+#: ../app/actions/tool-options-actions.c:71
+#, fuzzy
+#| msgid "_Delete Saved Options"
+msgctxt "tool-options-action"
 msgid "_Delete Saved Options"
 msgstr "_ล��ัว�ลือ��ี��ั��ึ�"
 
-#: ../app/actions/tool-options-actions.c:76
+#: ../app/actions/tool-options-actions.c:75
+msgctxt "tool-options-action"
 msgid "_New Entry..."
-msgstr "ราย�าร���า�_หม�..."
+msgstr "ราย�าร�_หม�..."
 
-#: ../app/actions/tool-options-actions.c:81
+#: ../app/actions/tool-options-actions.c:80
+#, fuzzy
+#| msgid "R_eset Tool Options"
+msgctxt "tool-options-action"
 msgid "R_eset Tool Options"
 msgstr "�_ลั���า�ัว�ลือ���รื�อ�มือ��ิม"
 
-#: ../app/actions/tool-options-actions.c:82
+#: ../app/actions/tool-options-actions.c:81
+#, fuzzy
+#| msgid "Reset to default values"
+msgctxt "tool-options-action"
 msgid "Reset to default values"
 msgstr "�ั��������า�ริยาย"
 
-#: ../app/actions/tool-options-actions.c:87
+#: ../app/actions/tool-options-actions.c:86
 #, fuzzy
+msgctxt "tool-options-action"
 msgid "Reset _all Tool Options"
 msgstr "�ลั���า�ัว�ลือ���รื�อ�มือ��ิม�ั��หม�..."
 
-#: ../app/actions/tool-options-actions.c:88
+#: ../app/actions/tool-options-actions.c:87
+#, fuzzy
+#| msgid "Reset all tool options"
+msgctxt "tool-options-action"
 msgid "Reset all tool options"
 msgstr "�ั����า��รื�อ�มือ�หม��ั��หม�"
 
-#: ../app/actions/tool-options-commands.c:71
+#: ../app/actions/tool-options-commands.c:70
 msgid "Save Tool Options"
 msgstr "�ั��ึ��ัว�ลือ���รื�อ�มือ"
 
-#: ../app/actions/tool-options-commands.c:75
+#: ../app/actions/tool-options-commands.c:74
 msgid "Enter a name for the saved options"
 msgstr "��อ��ื�อสำหรั��ัว�ลือ��ี�����ั��ึ�"
 
-#: ../app/actions/tool-options-commands.c:76
-#: ../app/actions/tool-options-commands.c:246
+#: ../app/actions/tool-options-commands.c:75
+#: ../app/actions/tool-options-commands.c:245
 #: ../app/actions/tool-options-commands.c:262
 msgid "Saved Options"
 msgstr "�ัว�ลือ��ี�����ั��ึ�"
 
-#: ../app/actions/tool-options-commands.c:140
+#: ../app/actions/tool-options-commands.c:138
 msgid "Rename Saved Tool Options"
 msgstr "��ลี�ย��ื�อ�ัว�ลือ���รื�อ�มือ�ี�����ั��ึ�"
 
-#: ../app/actions/tool-options-commands.c:144
+#: ../app/actions/tool-options-commands.c:142
 msgid "Enter a new name for the saved options"
 msgstr "��อ��ื�อ�หม�สำหรั��ัว�ลือ��ี�����ั��ึ�"
 
-#: ../app/actions/tool-options-commands.c:187
-msgid "Reset Tool Options"
-msgstr "�ลั���า��ิม�ัว�ลือ���รื�อ�มือ"
+#: ../app/actions/tool-options-commands.c:185
+#, fuzzy
+msgid "Reset All Tool Options"
+msgstr "�ลั���า�ัว�ลือ���รื�อ�มือ��ิม�ั��หม�..."
 
-#: ../app/actions/tool-options-commands.c:209
+#: ../app/actions/tool-options-commands.c:208
 msgid "Do you really want to reset all tool options to default values?"
 msgstr "�ุ���อ��าร�ี��ะ�ั����า��รื�อ�มือ������า�ริยาย���หรือ�ม�?"
 
-#: ../app/actions/tools-actions.c:47
-msgid "Tools Menu"
+#: ../app/actions/tool-preset-actions.c:44
+#, fuzzy
+#| msgid "Tools Menu"
+msgctxt "tool-preset-action"
+msgid "Tool Preset Menu"
 msgstr "ราย�าร��รื�อ�มือ"
 
-#: ../app/actions/tools-actions.c:50
-msgid "_Tools"
-msgstr "�_�รื�อ�มือ"
+#: ../app/actions/tool-preset-actions.c:48
+msgctxt "tool-preset-action"
+msgid "_New Tool Preset"
+msgstr ""
 
-#: ../app/actions/tools-actions.c:51
-msgid "_Selection Tools"
-msgstr "��รื�อ�มือ�ลือ�_�ื���ี�"
+#: ../app/actions/tool-preset-actions.c:49
+#, fuzzy
+#| msgid "Create a new template"
+msgctxt "tool-preset-action"
+msgid "Create a new tool preset"
+msgstr "สร�า���า��า��ม�����หม�"
 
-#: ../app/actions/tools-actions.c:52
-msgid "_Paint Tools"
-msgstr "��รื�อ�มือ_�าสี"
+#: ../app/actions/tool-preset-actions.c:54
+#, fuzzy
+#| msgid "D_uplicate Path"
+msgctxt "tool-preset-action"
+msgid "D_uplicate Tool Preset"
+msgstr "สำ�_�า�ส���า�"
 
-#: ../app/actions/tools-actions.c:53
-msgid "_Transform Tools"
-msgstr "��รื�อ�มือ�_�ล�ลั�ษ�ะ"
+#: ../app/actions/tool-preset-actions.c:55
+#, fuzzy
+#| msgid "Duplicate palette"
+msgctxt "tool-preset-action"
+msgid "Duplicate this tool preset"
+msgstr "สำ��า�า�สี"
 
-#: ../app/actions/tools-actions.c:54
-msgid "_Color Tools"
-msgstr "��รื�อ�มือ_สี"
+#: ../app/actions/tool-preset-actions.c:60
+#, fuzzy
+msgctxt "tool-preset-action"
+msgid "Copy Tool Preset _Location"
+msgstr "��ิ��า��ำ�ห���"
+
+#: ../app/actions/tool-preset-actions.c:61
+#, fuzzy
+#| msgid "Copy palette file location to clipboard"
+msgctxt "tool-preset-action"
+msgid "Copy tool preset file location to clipboard"
+msgstr "�ั�ลอ��ำ�ห������ม�า�สี��ยั��ลิ��อร��"
 
-#: ../app/actions/tools-actions.c:57
-msgid "R_aise Tool"
-msgstr "��รื�อ�มือสลั�_�ึ��"
+#: ../app/actions/tool-preset-actions.c:66
+#, fuzzy
+#| msgid "_Delete Color"
+msgctxt "tool-preset-action"
+msgid "_Delete Tool Preset"
+msgstr "_ล�สี"
 
-#: ../app/actions/tools-actions.c:58
-msgid "Raise tool"
-msgstr "��รื�อ�มือสลั��ึ��"
+#: ../app/actions/tool-preset-actions.c:67
+#, fuzzy
+msgctxt "tool-preset-action"
+msgid "Delete this tool preset"
+msgstr "ล��ั���า�"
+
+#: ../app/actions/tool-preset-actions.c:72
+#, fuzzy
+#| msgid "_Refresh Brushes"
+msgctxt "tool-preset-action"
+msgid "_Refresh Tool Presets"
+msgstr "�_รีย�หัว��ร��หม�"
 
-#: ../app/actions/tools-actions.c:63
-msgid "Ra_ise to Top"
-msgstr "สลั�_��สุ�"
+#: ../app/actions/tool-preset-actions.c:73
+#, fuzzy
+#| msgid "Refresh brushes"
+msgctxt "tool-preset-action"
+msgid "Refresh tool presets"
+msgstr "�รีย�หัว��ร��หม�"
 
-#: ../app/actions/tools-actions.c:64
-msgid "Raise tool to top"
-msgstr "สลั���รื�อ�มือ�ว���สุ�"
+#: ../app/actions/tool-preset-actions.c:81
+#, fuzzy
+#| msgid "_Edit Color..."
+msgctxt "tool-preset-action"
+msgid "_Edit Tool Preset..."
+msgstr "�_����สี..."
 
-#: ../app/actions/tools-actions.c:69
-msgid "L_ower Tool"
-msgstr "��รื�อ�มือสลั�_ล�"
+#: ../app/actions/tool-preset-actions.c:82
+msgctxt "tool-preset-action"
+msgid "Edit this tool preset"
+msgstr ""
 
-#: ../app/actions/tools-actions.c:70
-msgid "Lower tool"
-msgstr "��รื�อ�มือสลั�ล�"
+#: ../app/actions/tool-preset-editor-actions.c:42
+#, fuzzy
+#| msgid "Palette Editor Menu"
+msgctxt "tool-preset-editor-action"
+msgid "Tool Preset Editor Menu"
+msgstr "ราย�าร��รื�อ�มือ������า�สี"
 
-#: ../app/actions/tools-actions.c:75
-msgid "Lo_wer to Bottom"
-msgstr "สลั�ล�_ล�า�สุ�"
+#: ../app/actions/tool-preset-editor-actions.c:50
+#, fuzzy
+msgctxt "tool-preset-editor-action"
+msgid "Edit Active Tool Preset"
+msgstr "������า�สี"
 
-#: ../app/actions/tools-actions.c:76
-msgid "Lower tool to bottom"
-msgstr "สลั���รื�อ�มือ�ว�ล�า�สุ�"
+#: ../app/actions/tools-actions.c:45
+msgctxt "tools-action"
+msgid "_Tools"
+msgstr "�_�รื�อ�มือ"
+
+#: ../app/actions/tools-actions.c:46
+msgctxt "tools-action"
+msgid "_Selection Tools"
+msgstr "��รื�อ�มือ�ลือ�_�ื���ี�"
 
-#: ../app/actions/tools-actions.c:81
+#: ../app/actions/tools-actions.c:47
 #, fuzzy
-msgid "_Reset Order & Visibility"
-msgstr "�ริ�ม��าลำ�ั��ละ�ารมอ��ห��"
+#| msgid "_Paint Tools"
+msgctxt "tools-action"
+msgid "_Paint Tools"
+msgstr "��รื�อ�มือ_�าสี"
 
-#: ../app/actions/tools-actions.c:82
-msgid "Reset tool order and visibility"
-msgstr "�ื���าลำ�ั���รื�อ�มือ�ละ�ารมอ��ห��"
+#: ../app/actions/tools-actions.c:48
+#, fuzzy
+#| msgid "_Transform Tools"
+msgctxt "tools-action"
+msgid "_Transform Tools"
+msgstr "��รื�อ�มือ�_�ล�ลั�ษ�ะ"
 
-#: ../app/actions/tools-actions.c:90
-msgid "_Show in Toolbox"
-msgstr "�ส_�����ล�อ���รื�อ�มือ"
+#: ../app/actions/tools-actions.c:49
+#, fuzzy
+#| msgid "_Color Tools"
+msgctxt "tools-action"
+msgid "_Color Tools"
+msgstr "��รื�อ�มือ_สี"
 
-#: ../app/actions/tools-actions.c:99
+#: ../app/actions/tools-actions.c:55
+#, fuzzy
+#| msgid "_By Color"
+msgctxt "tools-action"
 msgid "_By Color"
 msgstr "_�ามสี"
 
-#: ../app/actions/tools-actions.c:104
+#: ../app/actions/tools-actions.c:56
+#, fuzzy
+#| msgid "Select regions by color"
+msgctxt "tools-action"
+msgid "Select regions with similar colors"
+msgstr "�ลือ��ื���ี��ามสี"
+
+#: ../app/actions/tools-actions.c:61
+#, fuzzy
+#| msgid "_Arbitrary Rotation..."
+msgctxt "tools-action"
 msgid "_Arbitrary Rotation..."
 msgstr "หมุ�อิส_ระ"
 
-#: ../app/actions/tools-actions.c:242
-msgid "Toggle Fixed-Aspect Option for Rectangle"
-msgstr ""
-
-#: ../app/actions/tools-actions.c:247
-msgid "Toggle Expand-From-Center Option for Rectangle"
+#: ../app/actions/tools-actions.c:62
+msgctxt "tools-action"
+msgid "Rotate by an arbitrary angle"
 msgstr ""
 
 #: ../app/actions/vectors-actions.c:44
+#, fuzzy
+#| msgid "Paths Menu"
+msgctxt "vectors-action"
 msgid "Paths Menu"
 msgstr "ราย�าร�ส���า�"
 
 #: ../app/actions/vectors-actions.c:48
+#, fuzzy
+#| msgid "Path _Tool"
+msgctxt "vectors-action"
 msgid "Path _Tool"
 msgstr "��รื�อ�มือ�ส�_��า�"
 
 #: ../app/actions/vectors-actions.c:53
+#, fuzzy
+#| msgid "_Edit Path Attributes..."
+msgctxt "vectors-action"
 msgid "_Edit Path Attributes..."
-msgstr "����_��ุ�สม�ั�ิ�อ��ส���า�..."
+msgstr "�_�����ุ�สม�ั�ิ�อ��ส���า�..."
 
 #: ../app/actions/vectors-actions.c:54
+#, fuzzy
+#| msgid "Edit path attributes"
+msgctxt "vectors-action"
 msgid "Edit path attributes"
 msgstr "������ุ�สม�ั�ิ�อ��ส���า�"
 
 #: ../app/actions/vectors-actions.c:59
+#, fuzzy
+#| msgid "_New Path..."
+msgctxt "vectors-action"
 msgid "_New Path..."
 msgstr "�ส���า��_หม�..."
 
 #: ../app/actions/vectors-actions.c:60
-msgid "New path..."
-msgstr "�ส���า��หม�..."
+#, fuzzy
+#| msgid "Create a new template"
+msgctxt "vectors-action"
+msgid "Create a new path..."
+msgstr "สร�า���า��า��ม�����หม�"
 
 #: ../app/actions/vectors-actions.c:65
-msgid "_New Path"
-msgstr "�ส���า��_หม�"
+#, fuzzy
+#| msgid "New path with last values"
+msgctxt "vectors-action"
+msgid "_New Path with last values"
+msgstr "สร�า��ส���า��หม���วย��าล�าสุ�"
 
 #: ../app/actions/vectors-actions.c:66
-msgid "New path with last values"
-msgstr "สร�า��ส���า��หม���วย��าล�าสุ�"
+#, fuzzy
+msgctxt "vectors-action"
+msgid "Create a new path with last used values"
+msgstr "�ั���า��หม���วย��าล�าสุ�"
 
 #: ../app/actions/vectors-actions.c:71
+#, fuzzy
+#| msgid "D_uplicate Path"
+msgctxt "vectors-action"
 msgid "D_uplicate Path"
 msgstr "สำ�_�า�ส���า�"
 
 #: ../app/actions/vectors-actions.c:72
-msgid "Duplicate path"
+#, fuzzy
+#| msgid "Duplicate path"
+msgctxt "vectors-action"
+msgid "Duplicate this path"
 msgstr "สำ��า�ส���า�"
 
 #: ../app/actions/vectors-actions.c:77
+#, fuzzy
+#| msgid "_Delete Path"
+msgctxt "vectors-action"
 msgid "_Delete Path"
 msgstr "_ล��ส���า�"
 
-#: ../app/actions/vectors-actions.c:78 ../app/core/core-enums.c:916
-msgid "Delete path"
+#: ../app/actions/vectors-actions.c:78
+#, fuzzy
+#| msgid "Delete path"
+msgctxt "vectors-action"
+msgid "Delete this path"
 msgstr "ล��ส���า�"
 
 #: ../app/actions/vectors-actions.c:83
+#, fuzzy
+#| msgid "Merge _Visible Paths"
+msgctxt "vectors-action"
 msgid "Merge _Visible Paths"
 msgstr "_รวม�ส���า��ี�มอ��ห��"
 
 #: ../app/actions/vectors-actions.c:88
+#, fuzzy
+#| msgid "_Raise Path"
+msgctxt "vectors-action"
 msgid "_Raise Path"
 msgstr "สลั��ส���า�_�ึ��"
 
 #: ../app/actions/vectors-actions.c:89
-msgid "Raise path"
+#, fuzzy
+#| msgid "Raise path"
+msgctxt "vectors-action"
+msgid "Raise this path"
 msgstr "สลั��ส���า��ึ��"
 
 #: ../app/actions/vectors-actions.c:94
+#, fuzzy
+#| msgid "Raise Path to _Top"
+msgctxt "vectors-action"
 msgid "Raise Path to _Top"
 msgstr "ย��ส���า��ว�_��สุ�"
 
 #: ../app/actions/vectors-actions.c:95
-msgid "Raise path to top"
+#, fuzzy
+#| msgid "Raise path to top"
+msgctxt "vectors-action"
+msgid "Raise this path to the top"
 msgstr "สลั��ส���า��ว���สุ�"
 
 #: ../app/actions/vectors-actions.c:100
+#, fuzzy
+#| msgid "_Lower Path"
+msgctxt "vectors-action"
 msgid "_Lower Path"
 msgstr "สลั��ส���า�_ล�"
 
 #: ../app/actions/vectors-actions.c:101
-msgid "Lower path"
+#, fuzzy
+#| msgid "Lower path"
+msgctxt "vectors-action"
+msgid "Lower this path"
 msgstr "สลั��ส���า�ล�"
 
 #: ../app/actions/vectors-actions.c:106
+#, fuzzy
+#| msgid "Lower Path to _Bottom"
+msgctxt "vectors-action"
 msgid "Lower Path to _Bottom"
 msgstr "สลั��ส���า��ว�ล�า_�สุ�"
 
 #: ../app/actions/vectors-actions.c:107
-msgid "Lower path to bottom"
+#, fuzzy
+#| msgid "Lower path to bottom"
+msgctxt "vectors-action"
+msgid "Lower this path to the bottom"
 msgstr "สลั��ส���า��ว�ล�า�สุ�"
 
 #: ../app/actions/vectors-actions.c:112
+#, fuzzy
+#| msgid "Stro_ke Path..."
+msgctxt "vectors-action"
 msgid "Stro_ke Path..."
 msgstr "�ี�ส��_�า��ส���า�..."
 
 #: ../app/actions/vectors-actions.c:113
-msgid "Stroke path..."
-msgstr "�ี�ส���า��ส���า�..."
+#, fuzzy
+msgctxt "vectors-action"
+msgid "Paint along the path"
+msgstr "��ล��ส���า������ี���ี��ลือ�"
 
 #: ../app/actions/vectors-actions.c:118
+#, fuzzy
+#| msgid "Stro_ke Path"
+msgctxt "vectors-action"
 msgid "Stro_ke Path"
 msgstr "�ี�ส��_�า��ส���า�"
 
 #: ../app/actions/vectors-actions.c:119
-msgid "Stroke path with last values"
+#, fuzzy
+#| msgid "Stroke path with last values"
+msgctxt "vectors-action"
+msgid "Paint along the path with last values"
 msgstr "�ี�ส���า��ส���า���วย��าล�าสุ�"
 
 #: ../app/actions/vectors-actions.c:124
+#, fuzzy
+#| msgid "Co_py Path"
+msgctxt "vectors-action"
 msgid "Co_py Path"
 msgstr "�ั_�ลอ��ส���า�"
 
 #: ../app/actions/vectors-actions.c:129
+#, fuzzy
+#| msgid "Paste Pat_h"
+msgctxt "vectors-action"
 msgid "Paste Pat_h"
 msgstr "�_�ะ�ส���า�"
 
 #: ../app/actions/vectors-actions.c:134
+#, fuzzy
+#| msgid "E_xport Path..."
+msgctxt "vectors-action"
 msgid "E_xport Path..."
 msgstr "ส�_�ออ��ส���า�..."
 
 #: ../app/actions/vectors-actions.c:139
+#, fuzzy
+#| msgid "I_mport Path..."
+msgctxt "vectors-action"
 msgid "I_mport Path..."
 msgstr "�ำ�_��า�ส���า�..."
 
-#: ../app/actions/vectors-actions.c:162
+#: ../app/actions/vectors-actions.c:147
+#, fuzzy
+#| msgid "_Visible"
+msgctxt "vectors-action"
+msgid "_Visible"
+msgstr "_มอ��ห��"
+
+#: ../app/actions/vectors-actions.c:153
+#, fuzzy
+#| msgid "_Linked"
+msgctxt "vectors-action"
+msgid "_Linked"
+msgstr "�_�ื�อม�ย�"
+
+#. GIMP_STOCK_LOCK
+#: ../app/actions/vectors-actions.c:159
+#, fuzzy
+#| msgid "Connect Strokes"
+msgctxt "vectors-action"
+msgid "L_ock strokes"
+msgstr "��อ�ส��"
+
+#: ../app/actions/vectors-actions.c:168
+#, fuzzy
+#| msgid "Path to Sele_ction"
+msgctxt "vectors-action"
 msgid "Path to Sele_ction"
 msgstr "��ล��ส���า������ื�_��ี��ลือ�"
 
-#: ../app/actions/vectors-actions.c:163 ../app/tools/gimpvectortool.c:1858
+#: ../app/actions/vectors-actions.c:169
+#, fuzzy
+#| msgid "Path to selection"
+msgctxt "vectors-action"
 msgid "Path to selection"
 msgstr "��ล��ส���า������ี���ี��ลือ�"
 
-#: ../app/actions/vectors-actions.c:168
+#: ../app/actions/vectors-actions.c:174
+#, fuzzy
+#| msgid "Fr_om Path"
+msgctxt "vectors-action"
 msgid "Fr_om Path"
 msgstr "�า_��ส���า�"
 
-#: ../app/actions/vectors-actions.c:174
-msgid "Add"
-msgstr "��ิ�ม"
+#: ../app/actions/vectors-actions.c:175
+#, fuzzy
+#| msgid "Replace the selection with this channel"
+msgctxt "vectors-action"
+msgid "Replace selection with path"
+msgstr "����ี��ื���ี��ลือ��ั��ุ�ั���วย�����ล�ี�"
 
-#: ../app/actions/vectors-actions.c:180 ../app/base/base-enums.c:116
-msgid "Subtract"
-msgstr "ล�"
+#: ../app/actions/vectors-actions.c:180
+#, fuzzy
+#| msgid "_Add to Selection"
+msgctxt "vectors-action"
+msgid "_Add to Selection"
+msgstr "�_�ิ�ม���า�����ื���ี��ลือ�"
+
+#: ../app/actions/vectors-actions.c:181
+#, fuzzy
+#| msgid "Path to selection"
+msgctxt "vectors-action"
+msgid "Add path to selection"
+msgstr "��ล��ส���า������ี���ี��ลือ�"
 
 #: ../app/actions/vectors-actions.c:186
-msgid "Intersect"
-msgstr "��ำ�ั�"
+#, fuzzy
+#| msgid "_Subtract from Selection"
+msgctxt "vectors-action"
+msgid "_Subtract from Selection"
+msgstr "_ล�ออ��า��ื���ี��ลือ�"
+
+#: ../app/actions/vectors-actions.c:187
+#, fuzzy
+#| msgid "_Subtract from Selection"
+msgctxt "vectors-action"
+msgid "Subtract path from selection"
+msgstr "_ล�ออ��า��ื���ี��ลือ�"
+
+#: ../app/actions/vectors-actions.c:192
+#, fuzzy
+#| msgid "_Intersect with Selection"
+msgctxt "vectors-action"
+msgid "_Intersect with Selection"
+msgstr "หาส�ว��ั�_��อ��ั��ื���ี��ลือ�"
+
+#: ../app/actions/vectors-actions.c:193
+#, fuzzy
+#| msgid "_Intersect with Selection"
+msgctxt "vectors-action"
+msgid "Intersect path with selection"
+msgstr "หาส�ว��ั�_��อ��ั��ื���ี��ลือ�"
 
-#: ../app/actions/vectors-actions.c:194
+#: ../app/actions/vectors-actions.c:201
+#, fuzzy
+#| msgid "Selecti_on to Path"
+msgctxt "vectors-action"
 msgid "Selecti_on to Path"
 msgstr "��ล��ื���ี��ลือ������ส��_�า�"
 
-#: ../app/actions/vectors-actions.c:195
+#: ../app/actions/vectors-actions.c:202 ../app/actions/vectors-actions.c:208
+#, fuzzy
+#| msgid "Selection to path"
+msgctxt "vectors-action"
 msgid "Selection to path"
 msgstr "��ล��ี���ี��ลือ������ส���า�"
 
-#: ../app/actions/vectors-actions.c:200
+#: ../app/actions/vectors-actions.c:207
+#, fuzzy
+#| msgid "To _Path"
+msgctxt "vectors-action"
 msgid "To _Path"
 msgstr "�����ส��_�า�"
 
-#: ../app/actions/vectors-actions.c:205
+#: ../app/actions/vectors-actions.c:213
+#, fuzzy
+#| msgid "Selection to Path (_Advanced)"
+msgctxt "vectors-action"
 msgid "Selection to Path (_Advanced)"
 msgstr "��ล��ื���ี��ลือ������ส���า� (_�ั��สู�)"
 
-#: ../app/actions/vectors-actions.c:206
+#: ../app/actions/vectors-actions.c:214
+#, fuzzy
+#| msgid "Advanced options"
+msgctxt "vectors-action"
 msgid "Advanced options"
 msgstr "�ัว�ลือ��ั��สู�"
 
@@ -3819,8 +5971,12 @@ msgstr "�ุ�สม�ั�ิ�ส���า�"
 msgid "Edit Path Attributes"
 msgstr "������ุ�สม�ั�ิ�ส���า�"
 
-#: ../app/actions/vectors-commands.c:165 ../app/actions/vectors-commands.c:166
-#: ../app/actions/vectors-commands.c:188
+#: ../app/actions/vectors-commands.c:165 ../app/vectors/gimpvectors.c:194
+#: ../app/widgets/gimpvectorstreeview.c:262
+msgid "Path"
+msgstr "�ส���า�"
+
+#: ../app/actions/vectors-commands.c:166
 msgid "New Path"
 msgstr "�ส���า��หม�"
 
@@ -3828,263 +5984,617 @@ msgstr "�ส���า��หม�"
 msgid "New Path Options"
 msgstr "�ัว�ลือ��ส���า��หม�"
 
-#: ../app/actions/vectors-commands.c:297 ../app/pdb/paths_cmds.c:608
-#: ../app/pdb/vectors_cmds.c:861
+#: ../app/actions/vectors-commands.c:314 ../app/pdb/paths-cmds.c:645
+#: ../app/pdb/vectors-cmds.c:1405
 msgid "Path to Selection"
 msgstr "��ล��ส���า������ี���ี��ลือ�"
 
-#: ../app/actions/vectors-commands.c:365 ../app/tools/gimpvectoroptions.c:174
-#: ../app/tools/gimpvectortool.c:1891 ../app/vectors/gimpvectors.c:199
+#: ../app/actions/vectors-commands.c:397 ../app/tools/gimpvectoroptions.c:198
+#: ../app/tools/gimpvectortool.c:1990 ../app/vectors/gimpvectors.c:202
 msgid "Stroke Path"
 msgstr "�ี�ส���า��ส���า�"
 
-#: ../app/actions/view-actions.c:65
+#: ../app/actions/view-actions.c:69
+#, fuzzy
+#| msgid "_View"
+msgctxt "view-action"
 msgid "_View"
 msgstr "�_ส��"
 
-#: ../app/actions/view-actions.c:66
+#: ../app/actions/view-actions.c:70
+#, fuzzy
+#| msgid "_Zoom"
+msgctxt "view-action"
 msgid "_Zoom"
 msgstr "_ย�อ�ยาย"
 
-#: ../app/actions/view-actions.c:67
+#: ../app/actions/view-actions.c:71
+#, fuzzy
+#| msgid "_Padding Color"
+msgctxt "view-action"
 msgid "_Padding Color"
 msgstr "สี�_อ��อ��ระ�าษ"
 
-#: ../app/actions/view-actions.c:69
+#: ../app/actions/view-actions.c:73
 #, fuzzy
+msgctxt "view-action"
 msgid "Move to Screen"
 msgstr "�ลื�อ����ี�ห��า�อ..."
 
-#: ../app/actions/view-actions.c:74
+#: ../app/actions/view-actions.c:77
+#, fuzzy
+#| msgid "_New View"
+msgctxt "view-action"
+msgid "_New View"
+msgstr "�ส_��มุมมอ��หม�"
+
+#: ../app/actions/view-actions.c:78
 #, fuzzy
+msgctxt "view-action"
 msgid "Create another view on this image"
 msgstr "สร�า�ห��า�อ�หม�สำหรั�ภา��ี�"
 
-#: ../app/actions/view-actions.c:79
+#: ../app/actions/view-actions.c:83
+#, fuzzy
+#| msgid "_Close"
+msgctxt "view-action"
 msgid "_Close"
 msgstr "�ิ_�"
 
-#: ../app/actions/view-actions.c:80
+#: ../app/actions/view-actions.c:84
 #, fuzzy
+msgctxt "view-action"
 msgid "Close this image window"
 msgstr "ภา����มห��า��า�"
 
-#: ../app/actions/view-actions.c:85
+#: ../app/actions/view-actions.c:89
+#, fuzzy
+#| msgid "_Fit Image in Window"
+msgctxt "view-action"
 msgid "_Fit Image in Window"
 msgstr "�ส_����ห��า��า���ียว"
 
-#: ../app/actions/view-actions.c:86
+#: ../app/actions/view-actions.c:90
 #, fuzzy
+msgctxt "view-action"
 msgid "Adjust the zoom ratio so that the image becomes fully visible"
 msgstr "�รั�����อั�รา�าร�ยาย �ึ���ำ�ห�สามาร��ห��ภา�����ั����"
 
-#: ../app/actions/view-actions.c:91
+#: ../app/actions/view-actions.c:95
 #, fuzzy
-msgid "Fit Image _to Window"
-msgstr "ภา����มห��า��า�"
+#| msgid "Fit to window"
+msgctxt "view-action"
+msgid "Fi_ll Window"
+msgstr "�อ�ี�ั�ห��า��า�"
 
-#: ../app/actions/view-actions.c:92
+#: ../app/actions/view-actions.c:96
 #, fuzzy
-msgid "Adjust the zoom ratio so that the window is used optimally"
+msgctxt "view-action"
+msgid "Adjust the zoom ratio so that the entire window is used"
 msgstr "�รั�����อั�รา�าร�ยาย �ึ���ำ�ห�ห��า��า��ู����อย�า����ม�วามสามาร�"
 
-#: ../app/actions/view-actions.c:97
+#: ../app/actions/view-actions.c:101
+#, fuzzy
+#| msgid "Re_vert"
+msgctxt "view-action"
+msgid "Re_vert Zoom"
+msgstr "ย�อ��ลั�"
+
+#: ../app/actions/view-actions.c:102
+msgctxt "view-action"
+msgid "Restore the previous zoom level"
+msgstr ""
+
+#: ../app/actions/view-actions.c:107
+#, fuzzy
+#| msgid "Na_vigation Window"
+msgctxt "view-action"
 msgid "Na_vigation Window"
 msgstr "ห��า��า�_�าร�ำ�า�"
 
-#: ../app/actions/view-actions.c:98
+#: ../app/actions/view-actions.c:108
 #, fuzzy
+msgctxt "view-action"
 msgid "Show an overview window for this image"
 msgstr "สร�า�ห��า�อ�หม�สำหรั�ภา��ี�"
 
-#: ../app/actions/view-actions.c:103
+#: ../app/actions/view-actions.c:113
+#, fuzzy
+#| msgid "Display _Filters..."
+msgctxt "view-action"
 msgid "Display _Filters..."
 msgstr "�ส��_�ิล��อร�..."
 
-#: ../app/actions/view-actions.c:104
+#: ../app/actions/view-actions.c:114
+#, fuzzy
+msgctxt "view-action"
 msgid "Configure filters applied to this view"
-msgstr ""
+msgstr "สร�า�ห��า�อ�หม�สำหรั�ภา��ี�"
 
-#: ../app/actions/view-actions.c:109
+#: ../app/actions/view-actions.c:119
+#, fuzzy
+#| msgid "Shrink _Wrap"
+msgctxt "view-action"
 msgid "Shrink _Wrap"
 msgstr "�รอ��_��าภา�"
 
-#: ../app/actions/view-actions.c:110
+#: ../app/actions/view-actions.c:120
+#, fuzzy
+#| msgid "Reduce the image window to the size of the image display"
+msgctxt "view-action"
 msgid "Reduce the image window to the size of the image display"
 msgstr "ล���า�ห��า��า��ห�มี��า����า�ั�ภา��ี��ส��อยู�"
 
-#: ../app/actions/view-actions.c:116
+#: ../app/actions/view-actions.c:125
+#, fuzzy
+#| msgid "_Open Display..."
+msgctxt "view-action"
+msgid "_Open Display..."
+msgstr "�_�ิ���อ��าร�ส���ล..."
+
+#: ../app/actions/view-actions.c:126
+#, fuzzy
+#| msgid "Connect to another display"
+msgctxt "view-action"
 msgid "Connect to another display"
 msgstr "�ิ���อ�ั�อี�ห��า�อ�ส���ล"
 
-#: ../app/actions/view-actions.c:124
+#: ../app/actions/view-actions.c:134
+#, fuzzy
+#| msgid "_Dot for Dot"
+msgctxt "view-action"
 msgid "_Dot for Dot"
 msgstr "_�ุ��ร��ุ�"
 
-#: ../app/actions/view-actions.c:125
+#: ../app/actions/view-actions.c:135
 #, fuzzy
+msgctxt "view-action"
 msgid "A pixel on the screen represents an image pixel"
 msgstr "�ุ�สีห�ึ�����อ�ะ�ส��ห�ึ���ุ�สี�อ�ภา�"
 
-#: ../app/actions/view-actions.c:131
+#: ../app/actions/view-actions.c:141
+#, fuzzy
+#| msgid "Show _Selection"
+msgctxt "view-action"
 msgid "Show _Selection"
 msgstr "�ส��_�ื���ี��ลือ�"
 
-#: ../app/actions/view-actions.c:132
+#: ../app/actions/view-actions.c:142
 #, fuzzy
+msgctxt "view-action"
 msgid "Display the selection outline"
 msgstr "สำ��า��า��า��ม�����ี��ลือ�"
 
-#: ../app/actions/view-actions.c:138
+#: ../app/actions/view-actions.c:148
+#, fuzzy
+#| msgid "Show _Layer Boundary"
+msgctxt "view-action"
 msgid "Show _Layer Boundary"
 msgstr "�ส���อ��_���ั���า�"
 
-#: ../app/actions/view-actions.c:139
+#: ../app/actions/view-actions.c:149
+#, fuzzy
+#| msgid "Draw a border around the active layer"
+msgctxt "view-action"
 msgid "Draw a border around the active layer"
 msgstr "��ีย��ส���อ�รอ�� �ั���า��ี��ำ�า�อยู�"
 
-#: ../app/actions/view-actions.c:145
+#: ../app/actions/view-actions.c:155
+#, fuzzy
+#| msgid "Show _Guides"
+msgctxt "view-action"
 msgid "Show _Guides"
 msgstr "�ส���ส��_�ำ��ว"
 
-#: ../app/actions/view-actions.c:151
+#: ../app/actions/view-actions.c:156
+#, fuzzy
+msgctxt "view-action"
+msgid "Display the image's guides"
+msgstr "สำ��า��า��า��ม�����ี��ลือ�"
+
+#: ../app/actions/view-actions.c:162
+#, fuzzy
+#| msgid "S_how Grid"
+msgctxt "view-action"
 msgid "S_how Grid"
 msgstr "�ส���ส��_�ิ�ั�"
 
-#: ../app/actions/view-actions.c:157
+#: ../app/actions/view-actions.c:163
+msgctxt "view-action"
+msgid "Display the image's grid"
+msgstr ""
+
+#: ../app/actions/view-actions.c:169
 #, fuzzy
+msgctxt "view-action"
 msgid "Show Sample Points"
 msgstr "�ส��_�ื���ี��ลือ�"
 
-#: ../app/actions/view-actions.c:163
+#: ../app/actions/view-actions.c:170
+msgctxt "view-action"
+msgid "Display the image's color sample points"
+msgstr ""
+
+#: ../app/actions/view-actions.c:176
+#, fuzzy
+#| msgid "Sn_ap to Guides"
+msgctxt "view-action"
 msgid "Sn_ap to Guides"
 msgstr "_ยึ��ั��ส���ำ��ว"
 
-#: ../app/actions/view-actions.c:169
+#: ../app/actions/view-actions.c:177
+msgctxt "view-action"
+msgid "Tool operations snap to guides"
+msgstr ""
+
+#: ../app/actions/view-actions.c:183
+#, fuzzy
+#| msgid "Sna_p to Grid"
+msgctxt "view-action"
 msgid "Sna_p to Grid"
 msgstr "ยึ_��ั��ส���ิ�ั�"
 
-#: ../app/actions/view-actions.c:175
+#: ../app/actions/view-actions.c:184
+msgctxt "view-action"
+msgid "Tool operations snap to the grid"
+msgstr ""
+
+#: ../app/actions/view-actions.c:190
+#, fuzzy
+#| msgid "Snap to _Canvas Edges"
+msgctxt "view-action"
 msgid "Snap to _Canvas Edges"
 msgstr "ยึ��ั��อ�ห��า_�ระ�าษ"
 
-#: ../app/actions/view-actions.c:181
+#: ../app/actions/view-actions.c:191
+msgctxt "view-action"
+msgid "Tool operations snap to the canvas edges"
+msgstr ""
+
+#: ../app/actions/view-actions.c:197
+#, fuzzy
+#| msgid "Snap t_o Active Path"
+msgctxt "view-action"
 msgid "Snap t_o Active Path"
 msgstr "ยื��ั��ส���า��ี��ำ�า�อยู�"
 
-#: ../app/actions/view-actions.c:187
+#: ../app/actions/view-actions.c:198
+#, fuzzy
+#| msgid "Export the active path"
+msgctxt "view-action"
+msgid "Tool operations snap to the active path"
+msgstr "ส��ออ���อมูล�ส���า��ี��ลือ�อยู�"
+
+#: ../app/actions/view-actions.c:204
+#, fuzzy
+#| msgid "Show _Menubar"
+msgctxt "view-action"
 msgid "Show _Menubar"
 msgstr "�ส���_��ราย�าร"
 
-#: ../app/actions/view-actions.c:193
+#: ../app/actions/view-actions.c:205
+#, fuzzy
+msgctxt "view-action"
+msgid "Show this window's menubar"
+msgstr "�ส���_���ม�ู"
+
+#: ../app/actions/view-actions.c:211
+#, fuzzy
+#| msgid "Show R_ulers"
+msgctxt "view-action"
 msgid "Show R_ulers"
 msgstr "�ส���ม�_�รร�ั�"
 
-#: ../app/actions/view-actions.c:199
+#: ../app/actions/view-actions.c:212
+msgctxt "view-action"
+msgid "Show this window's rulers"
+msgstr ""
+
+#: ../app/actions/view-actions.c:218
+#, fuzzy
+#| msgid "Show Scroll_bars"
+msgctxt "view-action"
 msgid "Show Scroll_bars"
 msgstr "�ส���_���ลื�อ�"
 
-#: ../app/actions/view-actions.c:205
+#: ../app/actions/view-actions.c:219
+#, fuzzy
+#| msgid "Show scroll_bars"
+msgctxt "view-action"
+msgid "Show this window's scrollbars"
+msgstr "�ส������_ลื�อ�"
+
+#: ../app/actions/view-actions.c:225
+#, fuzzy
+#| msgid "Show S_tatusbar"
+msgctxt "view-action"
 msgid "Show S_tatusbar"
 msgstr "�ส�����_ส�า�ะ"
 
-#: ../app/actions/view-actions.c:211
+#: ../app/actions/view-actions.c:226
+#, fuzzy
+#| msgid "Show tips on _startup"
+msgctxt "view-action"
+msgid "Show this window's statusbar"
+msgstr "�ส����ล��ลั��มื�อ�_ริ�ม��ร��รม"
+
+#: ../app/actions/view-actions.c:232
+#, fuzzy
+#| msgid "Fullscr_een"
+msgctxt "view-action"
 msgid "Fullscr_een"
 msgstr "���ม_�อ"
 
-#: ../app/actions/view-actions.c:212
+#: ../app/actions/view-actions.c:233
+#, fuzzy
+#| msgid "Toggle fullscreen view"
+msgctxt "view-action"
 msgid "Toggle fullscreen view"
 msgstr "��ิ��ิ�มุมมอ�������ม�อ"
 
-#: ../app/actions/view-actions.c:273
+#: ../app/actions/view-actions.c:264
+#, fuzzy
+#| msgid "Zoom _Out"
+msgctxt "view-zoom-action"
+msgid "Zoom _Out"
+msgstr "ย�_อ"
+
+#: ../app/actions/view-actions.c:265 ../app/actions/view-actions.c:277
+#, fuzzy
+#| msgid "Zoom out"
+msgctxt "view-action"
+msgid "Zoom out"
+msgstr "�ูมออ�"
+
+#: ../app/actions/view-actions.c:270
+#, fuzzy
+#| msgid "Zoom _In"
+msgctxt "view-zoom-action"
+msgid "Zoom _In"
+msgstr "�_ยาย"
+
+#: ../app/actions/view-actions.c:271 ../app/actions/view-actions.c:283
+#, fuzzy
+#| msgid "Zoom in"
+msgctxt "view-action"
+msgid "Zoom in"
+msgstr "�ูม���า"
+
+#: ../app/actions/view-actions.c:276
+#, fuzzy
+#| msgid "Zoom Out"
+msgctxt "view-zoom-action"
+msgid "Zoom Out"
+msgstr "�ูมออ�"
+
+#: ../app/actions/view-actions.c:282
+#, fuzzy
+#| msgid "Zoom In"
+msgctxt "view-zoom-action"
+msgid "Zoom In"
+msgstr "�ูม���า"
+
+#: ../app/actions/view-actions.c:301
 #, fuzzy
+msgctxt "view-zoom-action"
 msgid "1_6:1  (1600%)"
 msgstr "16:1  (1600%)"
 
-#: ../app/actions/view-actions.c:278
+#: ../app/actions/view-actions.c:302
+#, fuzzy
+#| msgid "Zoom 1:1"
+msgctxt "view-zoom-action"
+msgid "Zoom 16:1"
+msgstr "�ยาย 1:1"
+
+#: ../app/actions/view-actions.c:307
 #, fuzzy
+msgctxt "view-zoom-action"
 msgid "_8:1  (800%)"
 msgstr "8:1  (800%)"
 
-#: ../app/actions/view-actions.c:283
+#: ../app/actions/view-actions.c:308
+#, fuzzy
+#| msgid "Zoom 1:1"
+msgctxt "view-zoom-action"
+msgid "Zoom 8:1"
+msgstr "�ยาย 1:1"
+
+#: ../app/actions/view-actions.c:313
 #, fuzzy
+msgctxt "view-zoom-action"
 msgid "_4:1  (400%)"
 msgstr "4:1  (400%)"
 
-#: ../app/actions/view-actions.c:288
+#: ../app/actions/view-actions.c:314
+#, fuzzy
+#| msgid "Zoom 1:1"
+msgctxt "view-zoom-action"
+msgid "Zoom 4:1"
+msgstr "�ยาย 1:1"
+
+#: ../app/actions/view-actions.c:319
 #, fuzzy
+msgctxt "view-zoom-action"
 msgid "_2:1  (200%)"
 msgstr "2:1  (200%)"
 
-#: ../app/actions/view-actions.c:293
+#: ../app/actions/view-actions.c:320
+#, fuzzy
+#| msgid "Zoom 1:1"
+msgctxt "view-zoom-action"
+msgid "Zoom 2:1"
+msgstr "�ยาย 1:1"
+
+#: ../app/actions/view-actions.c:325
 #, fuzzy
+msgctxt "view-zoom-action"
 msgid "_1:1  (100%)"
 msgstr "1:1  (100%)"
 
-#: ../app/actions/view-actions.c:294
+#: ../app/actions/view-actions.c:326
+#, fuzzy
+#| msgid "Zoom 1:1"
+msgctxt "view-zoom-action"
 msgid "Zoom 1:1"
 msgstr "�ยาย 1:1"
 
-#: ../app/actions/view-actions.c:299
+#: ../app/actions/view-actions.c:331
 #, fuzzy
+msgctxt "view-zoom-action"
 msgid "1:_2  (50%)"
 msgstr "1:2  (50%)"
 
-#: ../app/actions/view-actions.c:304
+#: ../app/actions/view-actions.c:332
+#, fuzzy
+#| msgid "Zoom 1:1"
+msgctxt "view-zoom-action"
+msgid "Zoom 1:2"
+msgstr "�ยาย 1:1"
+
+#: ../app/actions/view-actions.c:337
 #, fuzzy
+msgctxt "view-zoom-action"
 msgid "1:_4  (25%)"
 msgstr "1:4  (25%)"
 
-#: ../app/actions/view-actions.c:309
+#: ../app/actions/view-actions.c:338
+#, fuzzy
+#| msgid "Zoom 1:1"
+msgctxt "view-zoom-action"
+msgid "Zoom 1:4"
+msgstr "�ยาย 1:1"
+
+#: ../app/actions/view-actions.c:343
 #, fuzzy
+msgctxt "view-zoom-action"
 msgid "1:_8  (12.5%)"
 msgstr "1:8  (12.5%)"
 
-#: ../app/actions/view-actions.c:314
+#: ../app/actions/view-actions.c:344
+#, fuzzy
+#| msgid "Zoom 1:1"
+msgctxt "view-zoom-action"
+msgid "Zoom 1:8"
+msgstr "�ยาย 1:1"
+
+#: ../app/actions/view-actions.c:349
 #, fuzzy
+msgctxt "view-zoom-action"
 msgid "1:1_6  (6.25%)"
 msgstr "1:16  (6.25%)"
 
-#: ../app/actions/view-actions.c:319
+#: ../app/actions/view-actions.c:350
+#, fuzzy
+#| msgid "Zoom 1:1"
+msgctxt "view-zoom-action"
+msgid "Zoom 1:16"
+msgstr "�ยาย 1:1"
+
+#: ../app/actions/view-actions.c:355
 #, fuzzy
+msgctxt "view-zoom-action"
 msgid "Othe_r..."
 msgstr "_อื���"
 
-#: ../app/actions/view-actions.c:327
+#: ../app/actions/view-actions.c:356
+msgctxt "view-zoom-action"
+msgid "Set a custom zoom factor"
+msgstr ""
+
+#: ../app/actions/view-actions.c:364
+#, fuzzy
+#| msgid "From _Theme"
+msgctxt "view-padding-color"
 msgid "From _Theme"
 msgstr "�า�_�ุ�������"
 
-#: ../app/actions/view-actions.c:332
+#: ../app/actions/view-actions.c:365
+#, fuzzy
+#| msgid "Add current background color"
+msgctxt "view-padding-color"
+msgid "Use the current theme's background color"
+msgstr "��ิ�มสี��วยสี�ื��หลั��ั��ุ�ั�"
+
+#: ../app/actions/view-actions.c:370
+#, fuzzy
+#| msgid "_Light Check Color"
+msgctxt "view-padding-color"
 msgid "_Light Check Color"
 msgstr "สี_สว�า�"
 
-#: ../app/actions/view-actions.c:337
+#: ../app/actions/view-actions.c:371
+#, fuzzy
+#| msgid "Light check color"
+msgctxt "view-padding-color"
+msgid "Use the light check color"
+msgstr "สีอ�อ�"
+
+#: ../app/actions/view-actions.c:376
+#, fuzzy
+#| msgid "_Dark Check Color"
+msgctxt "view-padding-color"
 msgid "_Dark Check Color"
 msgstr "สี�_��ม"
 
-#: ../app/actions/view-actions.c:342
+#: ../app/actions/view-actions.c:377
+#, fuzzy
+#| msgid "Dark check color"
+msgctxt "view-padding-color"
+msgid "Use the dark check color"
+msgstr "สี���ม"
+
+#: ../app/actions/view-actions.c:382
+#, fuzzy
+#| msgid "Select _Custom Color..."
+msgctxt "view-padding-color"
 msgid "Select _Custom Color..."
 msgstr "�ลือ�สี_��วย�ัว�อ�"
 
-#: ../app/actions/view-actions.c:347
+#: ../app/actions/view-actions.c:383
+msgctxt "view-padding-color"
+msgid "Use an arbitrary color"
+msgstr ""
+
+#: ../app/actions/view-actions.c:388
+#, fuzzy
+#| msgid "As in _Preferences"
+msgctxt "view-padding-color"
 msgid "As in _Preferences"
 msgstr "�าม��า�_��าร�รั�����"
 
-#: ../app/actions/view-actions.c:639
+#: ../app/actions/view-actions.c:390
+msgctxt "view-padding-color"
+msgid "Reset padding color to what's configured in preferences"
+msgstr ""
+
+#: ../app/actions/view-actions.c:589
+#, fuzzy, c-format
+#| msgid "_Zoom (%s)"
+msgid "Re_vert Zoom (%d%%)"
+msgstr "_ย�อ�ยาย (%s)"
+
+#: ../app/actions/view-actions.c:597
+#, fuzzy
+#| msgid "Re_vert"
+msgid "Re_vert Zoom"
+msgstr "ย�อ��ลั�"
+
+#: ../app/actions/view-actions.c:733
 #, fuzzy, c-format
 msgid "Othe_r (%s)..."
 msgstr " (%s) อื��..."
 
-#: ../app/actions/view-actions.c:648
+#: ../app/actions/view-actions.c:742
 #, c-format
 msgid "_Zoom (%s)"
 msgstr "_ย�อ�ยาย (%s)"
 
-#: ../app/actions/view-commands.c:571
+#: ../app/actions/view-commands.c:580
 msgid "Set Canvas Padding Color"
 msgstr "�ั����าสี�อ��อ�ห��า�ระ�าษ"
 
-#: ../app/actions/view-commands.c:573
+#: ../app/actions/view-commands.c:582
 msgid "Set Custom Canvas Padding Color"
 msgstr "�ั����าสี�อ��อ�ห��า�ระ�าษ��ย�ลือ��อ�"
 
@@ -4093,161 +6603,447 @@ msgstr "�ั����าสี�อ��อ�ห��า�ระ�า
 msgid "Screen %s"
 msgstr "ห��า�อ %s"
 
+#: ../app/actions/window-actions.c:170
+#, fuzzy, c-format
+msgid "Move this window to screen %s"
+msgstr "�ลื�อ����ี�ห��า�อ..."
+
+#: ../app/actions/windows-actions.c:85
+#, fuzzy
+#| msgid "Image Windows"
+msgctxt "windows-action"
+msgid "_Windows"
+msgstr "ห��า��า�ภา�"
+
+#: ../app/actions/windows-actions.c:87
+#, fuzzy
+msgctxt "windows-action"
+msgid "_Recently Closed Docks"
+msgstr "��ิ���ู������"
+
+#: ../app/actions/windows-actions.c:89
+#, fuzzy
+#| msgid "Dockable"
+msgctxt "windows-action"
+msgid "_Dockable Dialogs"
+msgstr "�ั��ส�สำรั��า����"
+
+#: ../app/actions/windows-actions.c:95
+#, fuzzy
+#| msgid "Close Dock"
+msgctxt "windows-action"
+msgid "Hide Docks"
+msgstr "�ิ�สำรั��า�"
+
+#: ../app/actions/windows-actions.c:103
+msgctxt "windows-action"
+msgid ""
+"When enabled docks and other dialogs are hidden, leaving only image windows."
+msgstr ""
+
+#: ../app/actions/windows-actions.c:109
+msgctxt "windows-action"
+msgid "Single-Window Mode"
+msgstr ""
+
+#: ../app/actions/windows-actions.c:110
+msgctxt "windows-action"
+msgid ""
+"When enabled GIMP is in a single-window mode. Far from completely "
+"implemented!"
+msgstr ""
+
 #: ../app/base/base-enums.c:23
+#, fuzzy
+#| msgid "Smooth"
+msgctxt "curve-type"
 msgid "Smooth"
 msgstr "�รีย�"
 
 #: ../app/base/base-enums.c:24
+#, fuzzy
+#| msgid "Freehand"
+msgctxt "curve-type"
 msgid "Freehand"
 msgstr "มือ��ล�า"
 
-#: ../app/base/base-enums.c:55 ../app/base/base-enums.c:122
-#: ../app/core/core-enums.c:1198
+#: ../app/base/base-enums.c:56
+#, fuzzy
+#| msgid "Value"
+msgctxt "histogram-channel"
 msgid "Value"
 msgstr "�วามสว�า�"
 
-#: ../app/base/base-enums.c:56 ../app/core/core-enums.c:1193
-#: ../app/tools/gimpcolorbalancetool.c:265
-#: ../app/tools/gimphuesaturationtool.c:235
+#: ../app/base/base-enums.c:57
+#, fuzzy
+#| msgid "Red"
+msgctxt "histogram-channel"
 msgid "Red"
 msgstr "สี���"
 
-#: ../app/base/base-enums.c:57 ../app/core/core-enums.c:1194
-#: ../app/tools/gimpcolorbalancetool.c:272
-#: ../app/tools/gimphuesaturationtool.c:237
+#: ../app/base/base-enums.c:58
+#, fuzzy
+#| msgid "Green"
+msgctxt "histogram-channel"
 msgid "Green"
 msgstr "สี��ียว"
 
-#: ../app/base/base-enums.c:58 ../app/core/core-enums.c:1195
-#: ../app/tools/gimpcolorbalancetool.c:279
-#: ../app/tools/gimphuesaturationtool.c:239
+#: ../app/base/base-enums.c:59
+#, fuzzy
+#| msgid "Blue"
+msgctxt "histogram-channel"
 msgid "Blue"
 msgstr "��ำ��ิ�"
 
-#: ../app/base/base-enums.c:59
+#: ../app/base/base-enums.c:60
+#, fuzzy
+#| msgid "Alpha"
+msgctxt "histogram-channel"
 msgid "Alpha"
 msgstr "อัล�า"
 
-#: ../app/base/base-enums.c:60 ../app/display/gimpdisplayshell-title.c:226
-#: ../app/widgets/widgets-enums.c:114
+#: ../app/base/base-enums.c:61
+#, fuzzy
+#| msgid "RGB"
+msgctxt "histogram-channel"
 msgid "RGB"
 msgstr "RGB"
 
-#: ../app/base/base-enums.c:108
+#: ../app/base/base-enums.c:113
+#, fuzzy
+#| msgid "Normal"
+msgctxt "layer-mode-effects"
 msgid "Normal"
 msgstr "���ิ"
 
-#: ../app/base/base-enums.c:109
+#: ../app/base/base-enums.c:114
+msgctxt "layer-mode-effects"
 msgid "Dissolve"
 msgstr ""
 
-#: ../app/base/base-enums.c:110
+#: ../app/base/base-enums.c:115
+#, fuzzy
+#| msgid "Blend"
+msgctxt "layer-mode-effects"
 msgid "Behind"
-msgstr ""
+msgstr "�สมสี"
 
-#: ../app/base/base-enums.c:111
+#: ../app/base/base-enums.c:116
+msgctxt "layer-mode-effects"
 msgid "Multiply"
 msgstr ""
 
-#: ../app/base/base-enums.c:112
+#: ../app/base/base-enums.c:117
+#, fuzzy
+msgctxt "layer-mode-effects"
 msgid "Screen"
-msgstr ""
+msgstr "ห��า�อ %s"
 
-#: ../app/base/base-enums.c:113
+#: ../app/base/base-enums.c:118
+msgctxt "layer-mode-effects"
 msgid "Overlay"
 msgstr ""
 
-#: ../app/base/base-enums.c:114
+#: ../app/base/base-enums.c:119
+#, fuzzy
+#| msgid "Preferences"
+msgctxt "layer-mode-effects"
 msgid "Difference"
-msgstr ""
+msgstr "�รั�����"
 
-#: ../app/base/base-enums.c:115
+#: ../app/base/base-enums.c:120
+#, fuzzy
+#| msgid "An_imation"
+msgctxt "layer-mode-effects"
 msgid "Addition"
-msgstr ""
+msgstr "�าร��ลื�อ��_หว"
 
-#: ../app/base/base-enums.c:117
+#: ../app/base/base-enums.c:121
+#, fuzzy
+#| msgid "Subtract"
+msgctxt "layer-mode-effects"
+msgid "Subtract"
+msgstr "ล�"
+
+#: ../app/base/base-enums.c:122
+#, fuzzy
+#| msgid "Pick only"
+msgctxt "layer-mode-effects"
 msgid "Darken only"
-msgstr ""
+msgstr "�������า�ั��"
 
-#: ../app/base/base-enums.c:118
+#: ../app/base/base-enums.c:123
+#, fuzzy
+#| msgid "Light check color"
+msgctxt "layer-mode-effects"
 msgid "Lighten only"
-msgstr ""
+msgstr "สีอ�อ�"
 
-#: ../app/base/base-enums.c:119 ../app/core/core-enums.c:1196
+#: ../app/base/base-enums.c:124
+#, fuzzy
+#| msgid "Hue:"
+msgctxt "layer-mode-effects"
 msgid "Hue"
-msgstr ""
+msgstr "�า�ุสี:"
 
-#: ../app/base/base-enums.c:120 ../app/core/core-enums.c:1197
+#: ../app/base/base-enums.c:125
+#, fuzzy
+#| msgid "Hue-Saturation"
+msgctxt "layer-mode-effects"
 msgid "Saturation"
-msgstr ""
+msgstr "�า�ุสี-�วามอิ�มสี"
 
-#: ../app/base/base-enums.c:121 ../app/tools/gimppaintoptions-gui.c:311
+#: ../app/base/base-enums.c:126
+#, fuzzy
+#| msgid "Color"
+msgctxt "layer-mode-effects"
 msgid "Color"
 msgstr "สี"
 
-#: ../app/base/base-enums.c:123
+#: ../app/base/base-enums.c:127
+#, fuzzy
+#| msgid "Value"
+msgctxt "layer-mode-effects"
+msgid "Value"
+msgstr "�วามสว�า�"
+
+#: ../app/base/base-enums.c:128
+#, fuzzy
+#| msgid "Devices"
+msgctxt "layer-mode-effects"
 msgid "Divide"
-msgstr ""
+msgstr "อุ��ร����า��"
 
-#: ../app/base/base-enums.c:124
+#: ../app/base/base-enums.c:129
+#, fuzzy
+#| msgid "Mode"
+msgctxt "layer-mode-effects"
 msgid "Dodge"
-msgstr ""
+msgstr "ระ��"
 
-#: ../app/base/base-enums.c:125
+#: ../app/base/base-enums.c:130
+#, fuzzy
+#| msgid "Blur"
+msgctxt "layer-mode-effects"
 msgid "Burn"
-msgstr ""
+msgstr "มัว"
 
-#: ../app/base/base-enums.c:126
+#: ../app/base/base-enums.c:131
+#, fuzzy
+#| msgid "Hard edge"
+msgctxt "layer-mode-effects"
 msgid "Hard light"
-msgstr ""
+msgstr "�อ����ม"
 
-#: ../app/base/base-enums.c:127
+#: ../app/base/base-enums.c:132
+#, fuzzy
+#| msgid "Scroll Right"
+msgctxt "layer-mode-effects"
 msgid "Soft light"
-msgstr ""
+msgstr "�ลือ��วา"
 
-#: ../app/base/base-enums.c:128
+#: ../app/base/base-enums.c:133
+msgctxt "layer-mode-effects"
 msgid "Grain extract"
 msgstr ""
 
-#: ../app/base/base-enums.c:129
+#: ../app/base/base-enums.c:134
+msgctxt "layer-mode-effects"
 msgid "Grain merge"
 msgstr ""
 
-#: ../app/base/base-enums.c:130
+#: ../app/base/base-enums.c:135
+#, fuzzy
+#| msgid "Color erase"
+msgctxt "layer-mode-effects"
 msgid "Color erase"
 msgstr "ล�สี"
 
-#: ../app/base/tile-swap.c:419
+#: ../app/base/base-enums.c:136
+#, fuzzy
+#| msgid "Eraser"
+msgctxt "layer-mode-effects"
+msgid "Erase"
+msgstr "ยา�ล�"
+
+#: ../app/base/base-enums.c:137
+#, fuzzy
+#| msgid "_Replace"
+msgctxt "layer-mode-effects"
+msgid "Replace"
+msgstr "�_���ี�"
+
+#: ../app/base/base-enums.c:138
+#, fuzzy
+msgctxt "layer-mode-effects"
+msgid "Anti erase"
+msgstr "�ื��ารล�  %s"
+
+#: ../app/base/tile-swap.c:710
+#, fuzzy
+#| msgid ""
+#| "Unable to open swap file. The Gimp has run out of memory and cannot use "
+#| "the swap file. Some parts of your images may be corrupted. Try to save "
+#| "your work using different filenames, restart the Gimp and check the "
+#| "location of the swap directory in your Preferences."
 msgid ""
-"Unable to open swap file. The Gimp has run out of memory and cannot use the "
-"swap file. Some parts of your images may be corrupted. Try to save your work "
-"using different filenames, restart the Gimp and check the location of the "
-"swap directory in your Preferences."
+"Unable to open swap file. GIMP has run out of memory and cannot use the swap "
+"file. Some parts of your images may be corrupted. Try to save your work "
+"using different filenames, restart GIMP and check the location of the swap "
+"directory in your Preferences."
 msgstr ""
 "�ม�สามาร���ิ���ล� swap ��� ห��วย�วาม�ำหม��ละ�����ล� swap �ม���� "
 "��อมูล�อ�ภา��า�ส�ว�อา��สียหาย �รุ�า�ั��ึ��า������ื�ออื�� �ริ�ม�าร�ำ�า� Gimp "
 "�หม��ละ�รว�สอ��ำ�ห����อ� swap ���ร��อรี����าร�รั�������า�อ���ร��รม"
 
-#: ../app/config/gimpconfig-file.c:66 ../app/core/gimpbrushgenerated.c:226
-#: ../app/core/gimpgradient-save.c:51 ../app/core/gimpgradient-save.c:145
-#: ../app/core/gimppalette.c:523 ../app/gui/themes.c:238
-#: ../app/tools/gimpimagemaptool.c:584 ../app/vectors/gimpvectors-export.c:83
-#: ../app/xcf/xcf.c:397
+#: ../app/base/tile-swap.c:725
+#, fuzzy, c-format
+msgid "Failed to resize swap file: %s"
+msgstr ""
+"�ำ��ือ�: �าร�ั��ึ���อมูลล�ม�หลว:\n"
+"\n"
+"%s"
+
+#: ../app/config/config-enums.c:24
+#, fuzzy
+#| msgid "Tool icon"
+msgctxt "cursor-mode"
+msgid "Tool icon"
+msgstr "�อ�อ���รื�อ�มือ"
+
+#: ../app/config/config-enums.c:25
+msgctxt "cursor-mode"
+msgid "Tool icon with crosshair"
+msgstr ""
+
+#: ../app/config/config-enums.c:26
+msgctxt "cursor-mode"
+msgid "Crosshair only"
+msgstr ""
+
+#: ../app/config/config-enums.c:56
+#, fuzzy
+#| msgid "From theme"
+msgctxt "canvas-padding-mode"
+msgid "From theme"
+msgstr "�า��ุ�������"
+
+#: ../app/config/config-enums.c:57
+#, fuzzy
+#| msgid "Light check color"
+msgctxt "canvas-padding-mode"
+msgid "Light check color"
+msgstr "สีอ�อ�"
+
+#: ../app/config/config-enums.c:58
+#, fuzzy
+#| msgid "Dark check color"
+msgctxt "canvas-padding-mode"
+msgid "Dark check color"
+msgstr "สี���ม"
+
+#: ../app/config/config-enums.c:59
+#, fuzzy
+#| msgid "Custom color"
+msgctxt "canvas-padding-mode"
+msgid "Custom color"
+msgstr "�ลือ�สี�อ�"
+
+#: ../app/config/config-enums.c:88
+#, fuzzy
+msgctxt "space-bar-action"
+msgid "No action"
+msgstr "�ม�มี�าร�ลือ�"
+
+#: ../app/config/config-enums.c:89
+#, fuzzy
+msgctxt "space-bar-action"
+msgid "Pan view"
+msgstr "�ส���ัวอย�า�"
+
+#: ../app/config/config-enums.c:90
+msgctxt "space-bar-action"
+msgid "Switch to Move tool"
+msgstr ""
+
+#: ../app/config/config-enums.c:118
+msgctxt "zoom-quality"
+msgid "Low"
+msgstr ""
+
+#: ../app/config/config-enums.c:119
+#, fuzzy
+#| msgid "Height"
+msgctxt "zoom-quality"
+msgid "High"
+msgstr "สู�"
+
+#: ../app/config/config-enums.c:147
+#, fuzzy
+#| msgid "GIMP help browser"
+msgctxt "help-browser-type"
+msgid "GIMP help browser"
+msgstr "�ัว�รีย��ูราย�าร��วย�หลือ GIMP"
+
+#: ../app/config/config-enums.c:148
+#, fuzzy
+#| msgid "Web browser"
+msgctxt "help-browser-type"
+msgid "Web browser"
+msgstr "�ัว�ู�ว��"
+
+#: ../app/config/config-enums.c:177
+#, fuzzy
+#| msgid "Normal window"
+msgctxt "window-hint"
+msgid "Normal window"
+msgstr "ห��า��า����ิ"
+
+#: ../app/config/config-enums.c:178
+#, fuzzy
+#| msgid "Fit to window"
+msgctxt "window-hint"
+msgid "Utility window"
+msgstr "�อ�ี�ั�ห��า��า�"
+
+#: ../app/config/config-enums.c:179
+msgctxt "window-hint"
+msgid "Keep above"
+msgstr ""
+
+#: ../app/config/config-enums.c:207
+#, fuzzy
+#| msgid "Black & white"
+msgctxt "cursor-format"
+msgid "Black & white"
+msgstr "�าว�ำ"
+
+#: ../app/config/config-enums.c:208
+msgctxt "cursor-format"
+msgid "Fancy"
+msgstr ""
+
+#: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62
+#: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50
+#: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:55
+#: ../app/gui/themes.c:238 ../app/tools/gimpcurvestool.c:690
+#: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81
+#: ../app/xcf/xcf.c:421
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "�ม�สามาร���ิ� '%s' ��ี�อ�ี��ะ��ีย�: %s ���"
 
-#: ../app/config/gimpconfig-file.c:77 ../app/config/gimpconfig-file.c:100
+#: ../app/config/gimpconfig-file.c:78 ../app/config/gimpconfig-file.c:101
 #, fuzzy, c-format
 msgid "Error writing '%s': %s"
 msgstr "��ิ���อ�ิ��ลา���ะ��ีย� '%s': %s"
 
-#: ../app/config/gimpconfig-file.c:88 ../app/tools/gimpimagemaptool.c:605
+#: ../app/config/gimpconfig-file.c:89
 #, fuzzy, c-format
 msgid "Error reading '%s': %s"
 msgstr "��ิ���อ�ิ��ลา���ะอ�า� '%s': %s"
 
-#: ../app/config/gimpconfig-file.c:130
+#: ../app/config/gimpconfig-file.c:131
 #, c-format
 msgid ""
 "There was an error parsing your '%s' file. Default values will be used. A "
@@ -4256,17 +7052,6 @@ msgstr ""
 "มี�าร�����ำ�ิ��ลา��ี���ล�'%s' �อ��ุ� ��า�ริยาย�ะ�ู��ำมา��� "
 "�ารสำรอ���อมูล�าร�รั���ลีี�ย�����ู�สร�า��ึ���ี� '%s'"
 
-#: ../app/config/gimprc.c:259 ../app/config/gimprc.c:272
-#: ../app/plug-in/gimppluginmanager.c:374
-#, fuzzy, c-format
-msgid "Parsing '%s'\n"
-msgstr "�ำลั��ั��ำ '%s'\n"
-
-#: ../app/config/gimprc.c:518
-#, c-format
-msgid "Saving '%s'\n"
-msgstr "�ำลั��ั��ึ� '%s'\n"
-
 #. Not all strings defined here are used in the user interface
 #. *  (the preferences dialog mainly) and only those that are should
 #. *  be marked for translation.
@@ -4280,47 +7065,55 @@ msgstr ""
 "�มื�อ��ิ�����า� ภา�ห�ึ���ะ�ลาย����ภา��ี��ำ�า�อยู��มื�อ���รั��าร�ระ�ำ "
 "�����าร����าร�ัว�ั��ารห��า��า� \"����ื�อ�ระ�ำ\""
 
-#: ../app/config/gimprc-blurbs.h:23
-msgid "Specifies how the area around the image should be drawn."
-msgstr "ระ�ุวิ�ี�ี��ื���ี�รอ� � ภา��ะ�ู���ีย��ึ��"
+#: ../app/config/gimprc-blurbs.h:23 ../app/config/gimprc-blurbs.h:28
+msgid "Sets the dynamics search path."
+msgstr ""
 
-#: ../app/config/gimprc-blurbs.h:26
+#: ../app/config/gimprc-blurbs.h:33
 msgid ""
 "Sets the canvas padding color used if the padding mode is set to custom "
 "color."
 msgstr "�ั����าสี�รอ�ห��า�ระ�าษ หา�ระ����า��รอ�����ั����า�����าร�ลือ�สี�อ�"
 
-#: ../app/config/gimprc-blurbs.h:33
+#: ../app/config/gimprc-blurbs.h:37
+msgid "Specifies how the area around the image should be drawn."
+msgstr "ระ�ุวิ�ี�ี��ื���ี�รอ� � ภา��ะ�ู���ีย��ึ��"
+
+#: ../app/config/gimprc-blurbs.h:43
+msgid "How to handle embedded color profiles when opening a file."
+msgstr ""
+
+#: ../app/config/gimprc-blurbs.h:46
 msgid "Ask for confirmation before closing an image without saving."
 msgstr "�าม��ื�อยื�ยั��าร�ิ�ภา���ย�ม�มี�าร�ั��ึ�"
 
-#: ../app/config/gimprc-blurbs.h:36
+#: ../app/config/gimprc-blurbs.h:49
 #, fuzzy
 msgid "Sets the pixel format to use for mouse pointers."
 msgstr "�ั����ารู�����ุ�ภา��อ���อร���อร��ี� Gimp �ะ�ำ�����"
 
-#: ../app/config/gimprc-blurbs.h:39
+#: ../app/config/gimprc-blurbs.h:52
 #, fuzzy
 msgid "Sets the type of mouse pointers to use."
 msgstr "�ั����าสภาวะ�อ���อร���อร� �ี� Gimp �ะ�ำ�����"
 
-#: ../app/config/gimprc-blurbs.h:42
+#: ../app/config/gimprc-blurbs.h:55
 msgid ""
 "Context-dependent mouse pointers are helpful.  They are enabled by default.  "
 "However, they require overhead that you may want to do without."
 msgstr ""
 
-#: ../app/config/gimprc-blurbs.h:50
+#: ../app/config/gimprc-blurbs.h:71
 msgid ""
 "When enabled, this will ensure that each pixel of an image gets mapped to a "
 "pixel on the screen."
 msgstr "�มื�อ��ิ�����า� �ะ�ำ�ห��ุ��ุ�ภา���ภา�มี�ำ�ห�����ียว�ั��ั��ุ�ภา�ภา����อ"
 
-#: ../app/config/gimprc-blurbs.h:72
+#: ../app/config/gimprc-blurbs.h:93
 msgid "This is the distance in pixels where Guide and Grid snapping activates."
 msgstr "�ี��ือระยะห�า�ระหว�า��ุ�ภา��ี�มี�ารยึ��ั��ส���ำ��ว�ละ�ส���ิ�ั�"
 
-#: ../app/config/gimprc-blurbs.h:76
+#: ../app/config/gimprc-blurbs.h:109
 msgid ""
 "Tools such as fuzzy-select and bucket fill find regions based on a seed-fill "
 "algorithm.  The seed fill starts at the initially selected pixel and "
@@ -4332,37 +7125,44 @@ msgstr ""
 "��ย�ำ��า�ุ�ภา��ริ�ม����ละ�ำ�าร�ยาย�ื���ี������ุ�ภา��ี���ล���ีย� �ละ�ะสิ��สุ��มื�อ�ุ�ภา��ั��มี��า "
 "Threshold ��ิ��ว�า��า�ี�ระ�ุ�ว�����า�ริยาย threshold"
 
-#: ../app/config/gimprc-blurbs.h:89
+#: ../app/config/gimprc-blurbs.h:122
 msgid ""
-"The window type hint that is set on dock windows. This may affect the way "
-"your window manager decorates and handles dock windows."
+"The window type hint that is set on dock windows and the toolbox window. "
+"This may affect the way your window manager decorates and handles these "
+"windows."
 msgstr ""
 
-#: ../app/config/gimprc-blurbs.h:120
+#: ../app/config/gimprc-blurbs.h:154
 msgid "When enabled, the selected brush will be used for all tools."
 msgstr "�มื�อ��ิ��าร��� หัว��ร��ี��ลือ��ะ�ู�������ุ���รื�อ�มือ"
 
-#: ../app/config/gimprc-blurbs.h:126
+#: ../app/config/gimprc-blurbs.h:157
+#, fuzzy
+#| msgid "When enabled, the selected brush will be used for all tools."
+msgid "When enabled, the selected dynamics will be used for all tools."
+msgstr "�มื�อ��ิ��าร��� หัว��ร��ี��ลือ��ะ�ู�������ุ���รื�อ�มือ"
+
+#: ../app/config/gimprc-blurbs.h:163
 msgid "When enabled, the selected gradient will be used for all tools."
 msgstr "�มื�อ��ิ�����า� สี�ร��า�ี��ลือ��ะ�ู�������ุ���รื�อ�มือ"
 
-#: ../app/config/gimprc-blurbs.h:129
+#: ../app/config/gimprc-blurbs.h:166
 msgid "When enabled, the selected pattern will be used for all tools."
 msgstr "�มื�อ��ิ�����า� ���ลาย�ี��ลือ��ะ�ู�������ุ���รื�อ�มือ"
 
-#: ../app/config/gimprc-blurbs.h:143
+#: ../app/config/gimprc-blurbs.h:180
 msgid "Sets the browser used by the help system."
 msgstr "�ั����า�ห�ระ���วาม��วย�หลือ�รีย������ราว���อร�"
 
-#: ../app/config/gimprc-blurbs.h:151
+#: ../app/config/gimprc-blurbs.h:191
 msgid "Sets the text to appear in image window status bars."
 msgstr "�ั����า�ห�มี��อ�วาม�รา�������ส�า�ะ�อ�ห���า��า�ภา�"
 
-#: ../app/config/gimprc-blurbs.h:154
+#: ../app/config/gimprc-blurbs.h:194
 msgid "Sets the text to appear in image window titles."
 msgstr "�ั����า�ห�มี��อ�วาม�รา�������หัว�รื�อ�ห��า��า�ภา�"
 
-#: ../app/config/gimprc-blurbs.h:157
+#: ../app/config/gimprc-blurbs.h:197
 msgid ""
 "When enabled, this will ensure that the full image is visible after a file "
 "is opened, otherwise it will be displayed with a scale of 1:1."
@@ -4370,45 +7170,49 @@ msgstr ""
 "�มื�อ��ิ�����า� �ะ�ำ�ห�ภา��ู��ส������ภา����มหลั��า������ิ���ล��ึ��มา �ละยั��ส����อั�ราส�ว� "
 "1:1 อี���วย"
 
-#: ../app/config/gimprc-blurbs.h:161
+#: ../app/config/gimprc-blurbs.h:201
 msgid ""
 "Install a private colormap; might be useful on 8-bit (256 colors) displays."
 msgstr "�ิ��ั���ั�สีส�ว��ัว: มี�ระ�ย���สำหรั��าร�ส����� 8 �ิ� (256 สี)"
 
-#: ../app/config/gimprc-blurbs.h:164
+#: ../app/config/gimprc-blurbs.h:204
 msgid ""
 "Sets the level of interpolation used for scaling and other transformations."
 msgstr "�ั����าระ�ั�วิ�ี�ระมา���า��ื�อ�าร�รั�สั�ส�ว��ละ�าร��ล�ลั�ษ�ะอื���"
 
-#: ../app/config/gimprc-blurbs.h:171
+#: ../app/config/gimprc-blurbs.h:211
+#, fuzzy
+msgid "Specifies the language to use for the user interface."
+msgstr "�ั����ารู�����ุ�ภา��อ���อร���อร��ี� Gimp �ะ�ำ�����"
+
+#: ../app/config/gimprc-blurbs.h:214
 msgid "How many recently opened image filenames to keep on the File menu."
 msgstr "มีภา��ี���ิ�������ิ�����ราย�าร��ล��ี�ภา�"
 
-#: ../app/config/gimprc-blurbs.h:174
+#: ../app/config/gimprc-blurbs.h:217
 msgid ""
 "Speed of marching ants in the selection outline.  This value is in "
 "milliseconds (less time indicates faster marching)."
 msgstr ""
 "�วาม�ร�ว�อ��ส��ม���ิ�รอ� � �ี���ี��ลือ� มีห��วย����มิลลิวิ�า�ี (�ะ��ลื�อ��หว�ร�ว�ึ���มื�อมี��า��อย)"
 
-#: ../app/config/gimprc-blurbs.h:178
+#: ../app/config/gimprc-blurbs.h:221
 msgid ""
 "GIMP will warn the user if an attempt is made to create an image that would "
 "take more memory than the size specified here."
 msgstr "GIMP �ะ��ือ��ู�����มื�อมี�าร��ิ��า��หม��ี�มี��า��ห����ิ��ว�า��า��อ�ห��วย�วาม�ำ�ี��ำห���ว�"
 
-#: ../app/config/gimprc-blurbs.h:182
+#: ../app/config/gimprc-blurbs.h:225
 #, fuzzy
-msgid "When enabled, GIMP will show mnemonics in menus."
-msgstr "�มื�อ��ิ�����า� GIMP "
-
-#: ../app/config/gimprc-blurbs.h:185
+#| msgid ""
+#| "Generally only a concern for 8-bit displays, this sets the minimum number "
+#| "of system colors allocated for the GIMP."
 msgid ""
 "Generally only a concern for 8-bit displays, this sets the minimum number of "
-"system colors allocated for the GIMP."
+"system colors allocated for GIMP."
 msgstr "��ย���ิภา��ะ�ส����ระ�� 8 �ิ� �ึ��������า�ั����ำ�อ�ระ��สี�ี������ GIMP "
 
-#: ../app/config/gimprc-blurbs.h:196
+#: ../app/config/gimprc-blurbs.h:235
 #, fuzzy
 msgid ""
 "Sets the monitor's horizontal resolution, in dots per inch.  If set to 0, "
@@ -4416,14 +7220,14 @@ msgid ""
 "resolution information."
 msgstr "�ั����า�วามละ�อีย���ว�อ��อ��อ��ห��วย �ุ���อ�ิ�ว ��าหา��ั����า���� 0 "
 
-#: ../app/config/gimprc-blurbs.h:201
+#: ../app/config/gimprc-blurbs.h:240
 msgid ""
 "Sets the monitor's vertical resolution, in dots per inch.  If set to 0, "
 "forces the X server to be queried for both horizontal and vertical "
 "resolution information."
 msgstr "�ั����า�วามละ�อีย���ว�ั���อ��อ��ห��วย �ุ���อ�ิ�ว ��าหา��ั����า���� 0 "
 
-#: ../app/config/gimprc-blurbs.h:206
+#: ../app/config/gimprc-blurbs.h:245
 #, fuzzy
 msgid ""
 "If enabled, the move tool sets the edited layer or path as active.  This "
@@ -4432,29 +7236,36 @@ msgstr ""
 "หา���ิ�����า� ��รื�ิอ�มือ Move �ะ�ำ�า����ั���า�หรือ�า��ี��ู��ลือ� "
 "�วามสามาร��ี�����ำห���ว��ล�ว�ั������วอร��ั����อ�ห��า�ี�"
 
-#: ../app/config/gimprc-blurbs.h:210
+#: ../app/config/gimprc-blurbs.h:249
 msgid ""
 "Sets the size of the navigation preview available in the lower right corner "
 "of the image window."
 msgstr "�ั����า��า��อ��ัว�ส��ภา�รวม �ึ���ส��อยู��ี���า�ล�า��วา�อ�ห��า��า�ภา�"
 
-#: ../app/config/gimprc-blurbs.h:214
+#: ../app/config/gimprc-blurbs.h:253
 msgid "Sets how many processors GIMP should try to use simultaneously."
 msgstr ""
 
-#: ../app/config/gimprc-blurbs.h:227
+#: ../app/config/gimprc-blurbs.h:266
+#, fuzzy
+#| msgid ""
+#| "When enabled, the X server is queried for the mouse's current position on "
+#| "each motion event, rather than relying on the position hint.  This means "
+#| "painting with large brushes should be more accurate, but it may be "
+#| "slower.  Perversely, on some X servers enabling this option results in "
+#| "faster painting."
 msgid ""
 "When enabled, the X server is queried for the mouse's current position on "
 "each motion event, rather than relying on the position hint.  This means "
 "painting with large brushes should be more accurate, but it may be slower.  "
-"Perversely, on some X servers enabling this option results in faster "
+"Conversely, on some X servers enabling this option results in faster "
 "painting."
 msgstr ""
 "�มื�อ��ิ�����า� X server �ะ�ามหา�ำ�ห����ั��ุ�ั��อ��มาส� "
 "�ั��หมาย�ึ��าร�าสี��วยหัว��ร���า��ห���ะมี�วาม�ู���อ�สู��ึ������ะ��าล� ���า� X server "
 "�าร��ิ�����ุ�สม�ั�ิ�ี�อา��ำ�ห��าร�าสี��ร�ว�ึ��"
 
-#: ../app/config/gimprc-blurbs.h:243
+#: ../app/config/gimprc-blurbs.h:282
 msgid ""
 "Sets whether GIMP should create previews of layers and channels. Previews in "
 "the layers and channels dialog are nice to have but they can slow things "
@@ -4464,54 +7275,61 @@ msgstr ""
 "�าร�ส��ภา��ัวอย�า����ล�อ�����อ��อ��ั���า��ละ�����ล�ำ�ห���า����ละ��าย��อ�าร���มา��ึ�� "
 "������ำ�ห���าล���า�ำ�า��ั�ภา���า��ห��มา��"
 
-#: ../app/config/gimprc-blurbs.h:248
+#: ../app/config/gimprc-blurbs.h:287
 msgid ""
 "Sets the preview size used for layers and channel previews in newly created "
 "dialogs."
 msgstr "�ั����า��า��าร�ส��ภา�สำหรั��ั���า��ละ�����ล�ี����สร�า��ึ��มา�หม�"
 
-#: ../app/config/gimprc-blurbs.h:252
+#: ../app/config/gimprc-blurbs.h:291
 msgid ""
 "When enabled, the image window will automatically resize itself whenever the "
 "physical image size changes."
 msgstr ""
 "�มื�อ��ิ���� ห��า��า�ภา��ะ�รั���า��ัว�อ���ยอั���มั�ิ �มื�อ��า��า��ายภา��อ�ภา�มี�าร��ลี�ย���ล�"
 
-#: ../app/config/gimprc-blurbs.h:256
+#: ../app/config/gimprc-blurbs.h:295
 msgid ""
 "When enabled, the image window will automatically resize itself when zooming "
 "into and out of images."
 msgstr "�มื�อ��ิ�����า� ห��า��า�ภา��ะ�รั���า��ัว�อ���ยอั���มั�ิ �มื�อมี�าร�ูมภา����า�ละออ�"
 
-#: ../app/config/gimprc-blurbs.h:260
+#: ../app/config/gimprc-blurbs.h:299
 msgid "Let GIMP try to restore your last saved session on each startup."
 msgstr "�ห� GIMP �ยายาม�รีย�วาระ�าร����า��รั��สุ���าย�ี��ั��ึ��ว��ุ��รั���ี��ริ�ม�����ร��รม"
 
-#: ../app/config/gimprc-blurbs.h:263
+#: ../app/config/gimprc-blurbs.h:302
 msgid ""
 "Remember the current tool, pattern, color, and brush across GIMP sessions."
 msgstr "���ำ��รื�อ�มือ�ี����อยู� ���ลาย สี �ละหัว��ร����าร��� GIMP �รั����อ��"
 
-#: ../app/config/gimprc-blurbs.h:267
+#: ../app/config/gimprc-blurbs.h:306
 #, fuzzy
-msgid "Add all opened and saved files to the document history on disk."
+msgid ""
+"Keep a permanent record of all opened and saved files in the Recent "
+"Documents list."
 msgstr "��ิ�ม���ม�ี���ิ��ละ�ั��ึ��ล�ว�ุ����ม���า���ระวั�ิ�ิ���า����ิส��"
 
-#: ../app/config/gimprc-blurbs.h:270
-msgid "Save the positions and sizes of the main dialogs when the GIMP exits."
+#: ../app/config/gimprc-blurbs.h:310
+#, fuzzy
+#| msgid ""
+#| "Save the positions and sizes of the main dialogs when the GIMP exits."
+msgid "Save the positions and sizes of the main dialogs when GIMP exits."
 msgstr "�ั��ึ��ำ�ห����ละ��า��อ��ล�อ�����อ�หลั��มื�อออ��า� GIMP �ล�ว"
 
-#: ../app/config/gimprc-blurbs.h:273
-msgid "Save the tool options when the GIMP exits."
+#: ../app/config/gimprc-blurbs.h:313
+#, fuzzy
+#| msgid "Save the tool options when the GIMP exits."
+msgid "Save the tool options when GIMP exits."
 msgstr "�ั��ึ���า�ัว�ลือ��อ���รื�อ�มือ �มื�อออ��า� GIMP"
 
-#: ../app/config/gimprc-blurbs.h:279
+#: ../app/config/gimprc-blurbs.h:319
 msgid ""
 "When enabled, all paint tools will show a preview of the current brush's "
 "outline."
 msgstr "�มื�อ��ิ�����า� ��รื�อ�มือ�ี�����าสี�ั��หม��ะ�ส���ส��ร�า��อ�หัว��ร��ี����อยู�"
 
-#: ../app/config/gimprc-blurbs.h:283
+#: ../app/config/gimprc-blurbs.h:323
 msgid ""
 "When enabled, dialogs will show a help button that gives access to the "
 "related help page.  Without this button, the help page can still be reached "
@@ -4520,13 +7338,13 @@ msgstr ""
 "�มื�อ��ิ���� �ล�อ�����อ��ะ�ส���ุ�ม��วย�หลือ�ึ������ำ��สู�ห��า��วย�หลือ�ี���ี�ยว��อ� หา��ม�มี�ุ�ม�ี� "
 "��ยั�สามาร����าสู�ห��า��วย�หลือ�����ย������ F1"
 
-#: ../app/config/gimprc-blurbs.h:288
+#: ../app/config/gimprc-blurbs.h:328
 msgid ""
 "When enabled, the mouse pointer will be shown over the image while using a "
 "paint tool."
 msgstr "�มื�อ��ิ���� �ัว�ี��มาส��ะ�ส���ห�ือภา�����ะ�ี�มี�าร�����รื�อ�มือ�าสี"
 
-#: ../app/config/gimprc-blurbs.h:292
+#: ../app/config/gimprc-blurbs.h:332
 msgid ""
 "When enabled, the menubar is visible by default. This can also be toggled "
 "with the \"View->Show Menubar\" command."
@@ -4534,7 +7352,7 @@ msgstr ""
 "�มื�อ��ิ�����า� �ะ�ส�����ราย�าร�ุ��รั���ี���ิ��า� "
 "���สามาร��ะสลั��าร�ส����ภายหลั������วย�ำสั�� \"View->Show Menubar\""
 
-#: ../app/config/gimprc-blurbs.h:296
+#: ../app/config/gimprc-blurbs.h:336
 msgid ""
 "When enabled, the rulers are visible by default. This can also be toggled "
 "with the \"View->Show Rulers\" command."
@@ -4542,7 +7360,7 @@ msgstr ""
 "�มื�อ��ิ�����า� �ะ�ส���ม��รร�ั��ุ��รั���ี���ิ��า� ���สามาร��ะสลั��าร�ส����ภายหลั������วย�ำสั�� "
 "\"View->Show Rulers\""
 
-#: ../app/config/gimprc-blurbs.h:300
+#: ../app/config/gimprc-blurbs.h:340
 msgid ""
 "When enabled, the scrollbars are visible by default. This can also be "
 "toggled with the \"View->Show Scrollbars\" command."
@@ -4550,7 +7368,7 @@ msgstr ""
 "�มื�อ��ิ�����า� �ะ�ส������ลื�อ��ุ��รั���ี���ิ��า� ���สามาร��ะสลั��าร�ส����ภายหลั������วย�ำสั�� "
 "\"View->Show Scrollbars\""
 
-#: ../app/config/gimprc-blurbs.h:304
+#: ../app/config/gimprc-blurbs.h:344
 msgid ""
 "When enabled, the statusbar is visible by default. This can also be toggled "
 "with the \"View->Show Statusbar\" command."
@@ -4558,7 +7376,7 @@ msgstr ""
 "�มื�อ��ิ�����า� �ะ�ส�����ส�า�ะ�ุ��รั���ี���ิ��า� ���สามาร��ะสลั��าร�ส����ภายหลั������วย�ำสั�� "
 "\"View->Show Statusbar\""
 
-#: ../app/config/gimprc-blurbs.h:308
+#: ../app/config/gimprc-blurbs.h:348
 msgid ""
 "When enabled, the selection is visible by default. This can also be toggled "
 "with the \"View->Show Selection\" command."
@@ -4566,7 +7384,7 @@ msgstr ""
 "�มื�อ��ิ�����า� �ะ�ส���ี���ี��าร�ลือ��ุ��รั���ี���ิ��า� "
 "���สามาร��ะสลั��าร�ส����ภายหลั������วย�ำสั�� \"View->Show Selection\""
 
-#: ../app/config/gimprc-blurbs.h:312
+#: ../app/config/gimprc-blurbs.h:352
 msgid ""
 "When enabled, the layer boundary is visible by default. This can also be "
 "toggled with the \"View->Show Layer Boundary\" command."
@@ -4574,7 +7392,7 @@ msgstr ""
 "�มื�อ��ิ�����า� �ะ�ส���รอ��อ��ั���า��ุ��รั���ี���ิ��า� ���สามาร��ะสลั��าร�ส�������วย�ำสั�� "
 "\"View->Show Layer Boundary\""
 
-#: ../app/config/gimprc-blurbs.h:316
+#: ../app/config/gimprc-blurbs.h:356
 msgid ""
 "When enabled, the guides are visible by default. This can also be toggled "
 "with the \"View->Show Guides\" command."
@@ -4582,7 +7400,7 @@ msgstr ""
 "�มื�อ��ิ�����า� �ะ�ส���ส���ำ��ว�ุ��รั���ี���ิ��า� ���สามาร��ะสลั��าร�ส�������วย�ำสั�� \"View-"
 ">Show Guides\""
 
-#: ../app/config/gimprc-blurbs.h:320
+#: ../app/config/gimprc-blurbs.h:360
 msgid ""
 "When enabled, the grid is visible by default. This can also be toggled with "
 "the \"View->Show Grid\" command."
@@ -4590,7 +7408,7 @@ msgstr ""
 "�มื�อ��ิ�����า� �ะ�ส���ส���ิ�ั��ุ��รั���ี���ิ��า� ���สามาร��ะระ�ั��าร�ส�������วย�ำสั�� \"View-"
 ">Show Grid\""
 
-#: ../app/config/gimprc-blurbs.h:324
+#: ../app/config/gimprc-blurbs.h:364
 #, fuzzy
 msgid ""
 "When enabled, the sample points are visible by default. This can also be "
@@ -4599,21 +7417,24 @@ msgstr ""
 "�มื�อ��ิ�����า� �ะ�ส���ม��รร�ั��ุ��รั���ี���ิ��า� ���สามาร��ะสลั��าร�ส����ภายหลั������วย�ำสั�� "
 "\"View->Show Rulers\""
 
-#: ../app/config/gimprc-blurbs.h:328
-#, fuzzy
-msgid "Enable displaying a handy GIMP tip on startup."
-msgstr "��ิ������ื�อ�ส����อมูล�าร��� GIMP �มื�อมี�าร�ริ�ม��ร��รม"
-
-#: ../app/config/gimprc-blurbs.h:331
+#: ../app/config/gimprc-blurbs.h:368
 #, fuzzy
 msgid "Show a tooltip when the pointer hovers over an item."
 msgstr "�ส����ล��ลั���รื�อ�มือ"
 
-#: ../app/config/gimprc-blurbs.h:334
+#: ../app/config/gimprc-blurbs.h:371
+msgid "Use GIMP in a single-window mode."
+msgstr ""
+
+#: ../app/config/gimprc-blurbs.h:374
+msgid "Hide docks and other windows, leaving only image windows."
+msgstr ""
+
+#: ../app/config/gimprc-blurbs.h:377
 msgid "What to do when the space bar is pressed in the image window."
 msgstr ""
 
-#: ../app/config/gimprc-blurbs.h:337
+#: ../app/config/gimprc-blurbs.h:380
 #, fuzzy
 msgid ""
 "Sets the swap file location. GIMP uses a tile based memory allocation "
@@ -4628,18 +7449,11 @@ msgstr ""
 "��ร��รา�ว�า��า��อ���ล�ส�ว���ะมี��า��ห��มา��มื�อมี�าร�ำ�ั�ภา���า��ห���ละ�าร�ำ�า����ะ��าอย�า�มา�หา�มี�าร�ำห����ล�ส�ว���ว��ื���ี�อื������รือ��าย "
 "��วย�ห�ุ�ี��ึ�����ำห���ำ�ห�����ล�ส�ว���ว��ี� \"/tmp\"ย"
 
-#: ../app/config/gimprc-blurbs.h:346
+#: ../app/config/gimprc-blurbs.h:389
 msgid "When enabled, menus can be torn off."
 msgstr "�มื�อ��ิ�����า� ราย�าร��า� � �ะ�ู��ั�ออ�"
 
-#: ../app/config/gimprc-blurbs.h:349
-msgid ""
-"When enabled, dock windows (the toolbox and palettes) are set to be "
-"transient to the active image window. Most window managers will keep the "
-"dock windows above the image window then, but it may also have other effects."
-msgstr ""
-
-#: ../app/config/gimprc-blurbs.h:355
+#: ../app/config/gimprc-blurbs.h:392
 msgid ""
 "When enabled, you can change keyboard shortcuts for menu items by hitting a "
 "key combination while the menu item is highlighted."
@@ -4647,34 +7461,40 @@ msgstr ""
 "�มื�อ��ิ�����า� สามาร���ลี�ย��ีย�ลั�สำหรั����ละ�ำสั�������ละราย�าร�����วย�าร���ุ�ม�� � "
 "�ี���อ��าร����ะ�ี��ำสั���ั���ู��ลือ�อยู�"
 
-#: ../app/config/gimprc-blurbs.h:359
-msgid "Save changed keyboard shortcuts when the GIMP exits."
+#: ../app/config/gimprc-blurbs.h:396
+#, fuzzy
+#| msgid "Save changed keyboard shortcuts when the GIMP exits."
+msgid "Save changed keyboard shortcuts when GIMP exits."
 msgstr "�ั��ึ��ีย�ลั��ี������ลี�ย��� �มื�อออ��า� GIMP"
 
-#: ../app/config/gimprc-blurbs.h:362
+#: ../app/config/gimprc-blurbs.h:399
 msgid "Restore saved keyboard shortcuts on each GIMP startup."
 msgstr "�รีย��ุ�มลั��ี�����ั��ึ��ว��ื� �ุ��รั���ี��ริ�ม��� GIMP"
 
-#: ../app/config/gimprc-blurbs.h:365
+#: ../app/config/gimprc-blurbs.h:402
+#, fuzzy
+#| msgid ""
+#| "Sets the folder for temporary storage. Files will appear here during the "
+#| "course of running the GIMP.  Most files will disappear when the GIMP "
+#| "exits, but some files are likely to remain, so it is best if this folder "
+#| "not be one that is shared by other users."
 msgid ""
 "Sets the folder for temporary storage. Files will appear here during the "
-"course of running the GIMP.  Most files will disappear when the GIMP exits, "
-"but some files are likely to remain, so it is best if this folder not be one "
-"that is shared by other users."
+"course of running GIMP.  Most files will disappear when GIMP exits, but some "
+"files are likely to remain, so it is best if this folder not be one that is "
+"shared by other users."
 msgstr ""
 "�ำห�����ร��อรี��อ��หล����อมูล�ั�ว�ราว ��ล���า� � �ะ�ู�สร�า��ึ���ี��ี�����ะ�ี���� GIMP อยู� "
 "��ล�ส�ว��ห���ะ�ู�ล�ออ���หลั��า�ออ��า� GIMP ���มี�า���ล��ี�ยั���อยู� "
 "��ราะ�ะ�ั���ะ�ี�ี�สุ�หา����ร��อรี��ี��ม�������ร�วม�ั��ู������อื��"
 
-#: ../app/config/gimprc-blurbs.h:377
-msgid ""
-"Sets the size of the thumbnail shown in the Open dialog. Note that GIMP can "
-"not create thumbnails if layer previews are disabled."
-msgstr ""
-"�ำห����า��อ�รู�ย�อ�ี��ส����ห��า��า��าร��ิ���ล� ��� GIMP �ม�สามาร�สร�า�รู�ย�อ��� "
-"��า�ม���ิ�����า�ส�ว��าร�ส���ั���า�"
+#: ../app/config/gimprc-blurbs.h:414
+#, fuzzy
+#| msgid "Sets the size of the previews in the Undo History."
+msgid "Sets the size of the thumbnail shown in the Open dialog."
+msgstr "�ำห����า��อ��าร�ส��ภา����รอ��ระวั�ิ�าร�รีย��ื�"
 
-#: ../app/config/gimprc-blurbs.h:381
+#: ../app/config/gimprc-blurbs.h:417
 msgid ""
 "The thumbnail in the Open dialog will be automatically updated if the file "
 "being previewed is smaller than the size set here."
@@ -4682,7 +7502,7 @@ msgstr ""
 "ภา�ย�อ��ห��า��า���ิ�ภา��ะ�ู��รั��าม�าร��ลี�ย���ล�อยู��สมอ "
 "�ึ��ม�ว�า��ล��ี��ำลั��ส���ั���ะมี��า��ล���ว�า�ี�����ำห���ว�"
 
-#: ../app/config/gimprc-blurbs.h:385
+#: ../app/config/gimprc-blurbs.h:421
 msgid ""
 "When the amount of pixel data exceeds this limit, GIMP will start to swap "
 "tiles to disk.  This is a lot slower but it makes it possible to work on "
@@ -4690,28 +7510,38 @@ msgid ""
 "you may want to set this to a higher value."
 msgstr ""
 
-#: ../app/config/gimprc-blurbs.h:395
-msgid ""
-"The window type hint that is set on the toolbox. This may affect how your "
-"window manager decorates and handles the toolbox window."
+#: ../app/config/gimprc-blurbs.h:427
+#, fuzzy
+#| msgid "Exchange foreground and background colors"
+msgid "Show the current foreground and background colors in the toolbox."
+msgstr "สลั�สี�ั�ระหว�า�_สี�ี��ห��า�ละสี�ื��หลั�"
+
+#: ../app/config/gimprc-blurbs.h:430
+#, fuzzy
+#| msgid "Show active _brush, pattern & gradient"
+msgid "Show the currently selected brush, pattern and gradient in the toolbox."
+msgstr "�ส��_หัว��ร�, ���ลาย �ละ����ล�สี�ี�����า�อยู�"
+
+#: ../app/config/gimprc-blurbs.h:433
+msgid "Show the currently active image in the toolbox."
 msgstr ""
 
-#: ../app/config/gimprc-blurbs.h:399
+#: ../app/config/gimprc-blurbs.h:439
 msgid "Sets the manner in which transparency is displayed in images."
 msgstr "�ำห��รู�����าร�ส���วาม��ร���ส��ภา�"
 
-#: ../app/config/gimprc-blurbs.h:402
+#: ../app/config/gimprc-blurbs.h:442
 msgid "Sets the size of the checkerboard used to display transparency."
 msgstr ""
 
-#: ../app/config/gimprc-blurbs.h:405
+#: ../app/config/gimprc-blurbs.h:445
 #, fuzzy
 msgid ""
-"When enabled, the GIMP will not save an image if it has not been changed "
-"since it was opened."
+"When enabled, GIMP will not save an image if it has not been changed since "
+"it was opened."
 msgstr "�มื�อ��ิ�����า� GIMP �ะ�ม��ั��ึ�หา�ภา��ั���ม����มี�าร��ลี�ย���ล��� � ��ิ��ึ��"
 
-#: ../app/config/gimprc-blurbs.h:409
+#: ../app/config/gimprc-blurbs.h:449
 msgid ""
 "Sets the minimal number of operations that can be undone. More undo levels "
 "are kept available until the undo-size limit is reached."
@@ -4719,7 +7549,7 @@ msgstr ""
 "�ำห���ำ�ว��ั����ำ�อ��ารย�อ��าร�ระ�ำ �ม��าร�ระ�ำ�ะ��ิ�มมา��ึ����ยั���ย�อ��าร�ระ�ำ��� "
 "���ึ���าห�ึ���ี��ำห���ว�"
 
-#: ../app/config/gimprc-blurbs.h:413
+#: ../app/config/gimprc-blurbs.h:453
 #, fuzzy
 msgid ""
 "Sets an upper limit to the memory that is used per image to keep operations "
@@ -4727,914 +7557,1508 @@ msgid ""
 "as configured can be undone."
 msgstr "�ั����าสู�สุ��อ�ห��วย�วาม�ำ�ี�������าร�����าร�ำ��ิ��าร��ลำ�ั��อ��ารย��ลิ��าร�ระ�ำ"
 
-#: ../app/config/gimprc-blurbs.h:418
+#: ../app/config/gimprc-blurbs.h:458
 msgid "Sets the size of the previews in the Undo History."
-msgstr "�ำห����า��อ��าร�ส��ภา����รอ��ระวั�ิ�าร�ลั��ื�"
+msgstr "�ำห����า��อ��าร�ส��ภา����ล�อ�����อ��ระวั�ิ�าร�รีย��ื�"
 
-#: ../app/config/gimprc-blurbs.h:421
+#: ../app/config/gimprc-blurbs.h:461
 msgid "When enabled, pressing F1 will open the help browser."
 msgstr "�มื�อ��ิ�����า� �ะ��ิ�ห��า��า���วย�หลือ��วย�าร���ุ�ม F1"
 
-#: ../app/config/gimprc-blurbs.h:424
-#, fuzzy, c-format
-msgid ""
-"Sets the external web browser to be used.  This can be an absolute path or "
-"the name of an executable to search for in the user's PATH. If the command "
-"contains '%s' it will be replaced with the URL, else the URL will be "
-"appended to the command with a space separating the two."
-msgstr ""
-"�ำห���าร�ำ�ัว�รีย��ู�ว������มา��� "
-"�ึ��อา��ะ�อ������ำ�ห���������ม�อ���ร��รมหรือ�ื�อ�อ����ม�ัว��ร��รม����� หา����ำสั��มี %s "
-"���ะ�ู������วย URL "
-
-#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:134
-#: ../app/core/gimp-units.c:164 ../app/gui/session.c:160
-#: ../app/plug-in/plug-in-rc.c:213
+#: ../app/config/gimprc-deserialize.c:134 ../app/core/gimp-modules.c:133
+#: ../app/core/gimp-units.c:163 ../app/gui/session.c:243
+#: ../app/plug-in/plug-in-rc.c:212
 #, fuzzy
 msgid "fatal parse error"
 msgstr "��อ�ิ��ลา���"
 
-#: ../app/config/gimprc-deserialize.c:163
+#: ../app/config/gimprc-deserialize.c:162
 #, c-format
 msgid "value for token %s is not a valid UTF-8 string"
 msgstr "��า�อ� %s ����ม��������อ�วาม��� UTF-8"
 
-#. no undo (or redo) steps available
-#: ../app/core/core-enums.c:53 ../app/core/core-enums.c:252
-#: ../app/core/core-enums.c:504 ../app/paint/paint-enums.c:81
-#: ../app/widgets/gimpimagepropview.c:401
+#: ../app/core/core-enums.c:54
+#, fuzzy
+#| msgid "None"
+msgctxt "convert-dither-type"
 msgid "None"
 msgstr "�ม�มี"
 
-#: ../app/core/core-enums.c:54
+#: ../app/core/core-enums.c:55
+#, fuzzy
+#| msgid "Floyd-Steinberg (normal)"
+msgctxt "convert-dither-type"
 msgid "Floyd-Steinberg (normal)"
 msgstr "Floyd-Steinberg (���ิ)"
 
-#: ../app/core/core-enums.c:55
+#: ../app/core/core-enums.c:56
 #, fuzzy
+msgctxt "convert-dither-type"
 msgid "Floyd-Steinberg (reduced color bleeding)"
 msgstr "�ลอย��-ส�����อร�� ("
 
-#: ../app/core/core-enums.c:56
+#: ../app/core/core-enums.c:57
+#, fuzzy
+#| msgid "Positioned"
+msgctxt "convert-dither-type"
 msgid "Positioned"
 msgstr "�ั��ำ�ห����ล�ว"
 
-#: ../app/core/core-enums.c:85
+#: ../app/core/core-enums.c:87
+#, fuzzy
+#| msgid "Generate optimum palette"
+msgctxt "convert-palette-type"
 msgid "Generate optimum palette"
 msgstr "สร�า��า�สี�ี��ี�ี�สุ�"
 
-#: ../app/core/core-enums.c:86
+#: ../app/core/core-enums.c:88
+#, fuzzy
+#| msgid "Use web-optimized palette"
+msgctxt "convert-palette-type"
 msgid "Use web-optimized palette"
 msgstr "����า�สีสำหรั��ว��"
 
-#: ../app/core/core-enums.c:87
+#: ../app/core/core-enums.c:89
+#, fuzzy
+#| msgid "Use black and white (1-bit) palette"
+msgctxt "convert-palette-type"
 msgid "Use black and white (1-bit) palette"
 msgstr "����า�สี�าว�ำ (1 �ิ�)"
 
-#: ../app/core/core-enums.c:88
+#: ../app/core/core-enums.c:90
+#, fuzzy
+#| msgid "Use custom palette"
+msgctxt "convert-palette-type"
 msgid "Use custom palette"
 msgstr "����า�สี�ลือ��อ�"
 
-#: ../app/core/core-enums.c:211
+#: ../app/core/core-enums.c:216
 #, fuzzy
+msgctxt "align-reference-type"
 msgid "First item"
 msgstr "�า��ุ�������"
 
-#: ../app/core/core-enums.c:213 ../app/dialogs/dialogs.c:189
+#: ../app/core/core-enums.c:217
+#, fuzzy
+#| msgid "Image"
+msgctxt "align-reference-type"
+msgid "Image"
+msgstr "ภา�"
+
+#: ../app/core/core-enums.c:218
+#, fuzzy
+#| msgid "Selection"
+msgctxt "align-reference-type"
 msgid "Selection"
 msgstr "�ื���ี��าร�ลือ�"
 
-#: ../app/core/core-enums.c:214
+#: ../app/core/core-enums.c:219
 #, fuzzy
+msgctxt "align-reference-type"
 msgid "Active layer"
 msgstr "�ิล��อร��ี��ำลั��ำ�า�"
 
-#: ../app/core/core-enums.c:215
+#: ../app/core/core-enums.c:220
 #, fuzzy
+msgctxt "align-reference-type"
 msgid "Active channel"
 msgstr "�����ล�หม�"
 
-#: ../app/core/core-enums.c:216
+#: ../app/core/core-enums.c:221
 #, fuzzy
+msgctxt "align-reference-type"
 msgid "Active path"
 msgstr "สลั��ส���า��ึ��"
 
-#: ../app/core/core-enums.c:247
+#: ../app/core/core-enums.c:253
+#, fuzzy
+#| msgid "Foreground color"
+msgctxt "fill-type"
 msgid "Foreground color"
 msgstr "สี�ื��ห��า"
 
-#: ../app/core/core-enums.c:248
+#: ../app/core/core-enums.c:254
+#, fuzzy
+#| msgid "Background color"
+msgctxt "fill-type"
 msgid "Background color"
 msgstr "สี�ื��หลั�"
 
-#: ../app/core/core-enums.c:249
+#: ../app/core/core-enums.c:255
+#, fuzzy
+#| msgid "White"
+msgctxt "fill-type"
 msgid "White"
 msgstr "�าว"
 
-#. Transparency
-#: ../app/core/core-enums.c:250 ../app/dialogs/preferences-dialog.c:2182
+#: ../app/core/core-enums.c:256
+#, fuzzy
+#| msgid "Transparency"
+msgctxt "fill-type"
 msgid "Transparency"
 msgstr "��ร���ส"
 
-#: ../app/core/core-enums.c:251 ../app/core/core-enums.c:308
+#: ../app/core/core-enums.c:257
+#, fuzzy
+#| msgid "Pattern"
+msgctxt "fill-type"
+msgid "Pattern"
+msgstr "���ลาย"
+
+#: ../app/core/core-enums.c:258
+#, fuzzy
+#| msgid "None"
+msgctxt "fill-type"
+msgid "None"
+msgstr "�ม�มี"
+
+#: ../app/core/core-enums.c:286
+#, fuzzy
+msgctxt "fill-style"
+msgid "Solid color"
+msgstr "�����สี"
+
+#: ../app/core/core-enums.c:287
+#, fuzzy
+#| msgid "Pattern"
+msgctxt "fill-style"
 msgid "Pattern"
 msgstr "���ลาย"
 
-#: ../app/core/core-enums.c:279
+#: ../app/core/core-enums.c:315
+#, fuzzy
+#| msgid "Stroke line"
+msgctxt "stroke-method"
 msgid "Stroke line"
 msgstr "�ี�ส��"
 
-#: ../app/core/core-enums.c:280
+#: ../app/core/core-enums.c:316
+#, fuzzy
+#| msgid "Stroke with a paint tool"
+msgctxt "stroke-method"
 msgid "Stroke with a paint tool"
 msgstr "�ี�ส����วย��รื�อ�มือ�าสี"
 
-#: ../app/core/core-enums.c:307
+#: ../app/core/core-enums.c:345
 #, fuzzy
-msgid "Solid color"
-msgstr "�����สี"
-
-#: ../app/core/core-enums.c:336
+#| msgid "Miter"
+msgctxt "join-style"
 msgid "Miter"
 msgstr "�หลม"
 
-#: ../app/core/core-enums.c:337 ../app/core/core-enums.c:367
+#: ../app/core/core-enums.c:346
+#, fuzzy
+#| msgid "Round"
+msgctxt "join-style"
 msgid "Round"
 msgstr "ม�"
 
-#: ../app/core/core-enums.c:338
+#: ../app/core/core-enums.c:347
+#, fuzzy
+#| msgid "Bevel"
+msgctxt "join-style"
 msgid "Bevel"
 msgstr "�ั��หลี�ยม"
 
-#: ../app/core/core-enums.c:366
+#: ../app/core/core-enums.c:376
+#, fuzzy
+#| msgid "Butt"
+msgctxt "cap-style"
 msgid "Butt"
 msgstr "�ั��ลาย"
 
-#: ../app/core/core-enums.c:368 ../app/core/core-enums.c:443
+#: ../app/core/core-enums.c:377
+#, fuzzy
+#| msgid "Round"
+msgctxt "cap-style"
+msgid "Round"
+msgstr "ม�"
+
+#: ../app/core/core-enums.c:378
+#, fuzzy
+#| msgid "Square"
+msgctxt "cap-style"
 msgid "Square"
 msgstr "สี��หลี�ยม��อ�ลาย"
 
-#: ../app/core/core-enums.c:404
+#: ../app/core/core-enums.c:415
+#, fuzzy
+#| msgid "Custom"
+msgctxt "dash-preset"
 msgid "Custom"
 msgstr "�ลือ��อ�"
 
-#: ../app/core/core-enums.c:405
+#: ../app/core/core-enums.c:416
+#, fuzzy
+#| msgid "Line"
+msgctxt "dash-preset"
 msgid "Line"
 msgstr "�ส��"
 
-#: ../app/core/core-enums.c:406
+#: ../app/core/core-enums.c:417
+#, fuzzy
+#| msgid "Long dashes"
+msgctxt "dash-preset"
 msgid "Long dashes"
 msgstr "�ี���า�ยาว"
 
-#: ../app/core/core-enums.c:407
+#: ../app/core/core-enums.c:418
+#, fuzzy
+#| msgid "Medium dashes"
+msgctxt "dash-preset"
 msgid "Medium dashes"
 msgstr "�ี���า��ลา�"
 
-#: ../app/core/core-enums.c:408
+#: ../app/core/core-enums.c:419
+#, fuzzy
+#| msgid "Short dashes"
+msgctxt "dash-preset"
 msgid "Short dashes"
 msgstr "�ี���า�สั��"
 
-#: ../app/core/core-enums.c:409
+#: ../app/core/core-enums.c:420
 #, fuzzy
+msgctxt "dash-preset"
 msgid "Sparse dots"
 msgstr "�ุ��ระ�ราย"
 
-#: ../app/core/core-enums.c:410
+#: ../app/core/core-enums.c:421
+#, fuzzy
+#| msgid "Normal dots"
+msgctxt "dash-preset"
 msgid "Normal dots"
 msgstr "�ุ����ิ"
 
-#: ../app/core/core-enums.c:411
+#: ../app/core/core-enums.c:422
+#, fuzzy
+#| msgid "Dense dots"
+msgctxt "dash-preset"
 msgid "Dense dots"
 msgstr "�ุ�����"
 
-#: ../app/core/core-enums.c:412
+#: ../app/core/core-enums.c:423
+#, fuzzy
+#| msgid "Stipples"
+msgctxt "dash-preset"
 msgid "Stipples"
 msgstr "���ม"
 
-#: ../app/core/core-enums.c:413
+#: ../app/core/core-enums.c:424
 #, fuzzy
+msgctxt "dash-preset"
 msgid "Dash, dot"
 msgstr "�ี��ุ�..."
 
-#: ../app/core/core-enums.c:414
+#: ../app/core/core-enums.c:425
 #, fuzzy
+msgctxt "dash-preset"
 msgid "Dash, dot, dot"
 msgstr "�ี��ุ��ุ�..."
 
-#: ../app/core/core-enums.c:442
+#: ../app/core/core-enums.c:454
+#, fuzzy
+#| msgid "Circle"
+msgctxt "brush-generated-shape"
 msgid "Circle"
 msgstr "ว��ลม"
 
-#: ../app/core/core-enums.c:444
+#: ../app/core/core-enums.c:455
+#, fuzzy
+#| msgid "Square"
+msgctxt "brush-generated-shape"
+msgid "Square"
+msgstr "สี��หลี�ยม��อ�ลาย"
+
+#: ../app/core/core-enums.c:456
+#, fuzzy
+#| msgid "Diamond"
+msgctxt "brush-generated-shape"
 msgid "Diamond"
 msgstr "�ระ�าย���ร"
 
-#: ../app/core/core-enums.c:472 ../app/dialogs/preferences-dialog.c:2214
+#: ../app/core/core-enums.c:485
+#, fuzzy
+#| msgid "Horizontal"
+msgctxt "orientation-type"
 msgid "Horizontal"
 msgstr "��ว�อ�"
 
-#: ../app/core/core-enums.c:473 ../app/dialogs/preferences-dialog.c:2216
+#: ../app/core/core-enums.c:486
+#, fuzzy
+#| msgid "Vertical"
+msgctxt "orientation-type"
 msgid "Vertical"
 msgstr "��ว�ั��"
 
-#: ../app/core/core-enums.c:474
+#: ../app/core/core-enums.c:487
+#, fuzzy
+#| msgid "Unknown"
+msgctxt "orientation-type"
 msgid "Unknown"
 msgstr "�ม�รู��ั�"
 
-#: ../app/core/core-enums.c:505
+#: ../app/core/core-enums.c:518
 #, fuzzy
+#| msgid "None"
+msgctxt "item-set"
+msgid "None"
+msgstr "�ม�มี"
+
+#: ../app/core/core-enums.c:519
+#, fuzzy
+msgctxt "item-set"
 msgid "All layers"
 msgstr "�ุ����ม"
 
-#: ../app/core/core-enums.c:506
+#: ../app/core/core-enums.c:520
 #, fuzzy
+msgctxt "item-set"
 msgid "Image-sized layers"
 msgstr "�รั���า��ั���า�"
 
-#: ../app/core/core-enums.c:507
+#: ../app/core/core-enums.c:521
 #, fuzzy
+msgctxt "item-set"
 msgid "All visible layers"
 msgstr "รวม�ั���า��ี�มอ��ห��"
 
-#: ../app/core/core-enums.c:508
+#: ../app/core/core-enums.c:522
 #, fuzzy
+msgctxt "item-set"
 msgid "All linked layers"
 msgstr "%d �ั���า�"
 
-#: ../app/core/core-enums.c:572
+#: ../app/core/core-enums.c:588
+#, fuzzy
+#| msgid "Tiny"
+msgctxt "view-size"
 msgid "Tiny"
 msgstr "�ิ�ว"
 
-#: ../app/core/core-enums.c:573
+#: ../app/core/core-enums.c:589
+#, fuzzy
+#| msgid "Very small"
+msgctxt "view-size"
 msgid "Very small"
 msgstr "�ล��มา�"
 
-#: ../app/core/core-enums.c:574
+#: ../app/core/core-enums.c:590
+#, fuzzy
+#| msgid "Small"
+msgctxt "view-size"
 msgid "Small"
 msgstr "�ล��"
 
-#: ../app/core/core-enums.c:575
+#: ../app/core/core-enums.c:591
+#, fuzzy
+#| msgid "Medium"
+msgctxt "view-size"
 msgid "Medium"
 msgstr "�ลา�"
 
-#: ../app/core/core-enums.c:576
+#: ../app/core/core-enums.c:592
+#, fuzzy
+#| msgid "Large"
+msgctxt "view-size"
 msgid "Large"
 msgstr "�ห��"
 
-#: ../app/core/core-enums.c:577
+#: ../app/core/core-enums.c:593
+#, fuzzy
+#| msgid "Very large"
+msgctxt "view-size"
 msgid "Very large"
 msgstr "�ห��มา�"
 
-#: ../app/core/core-enums.c:578
+#: ../app/core/core-enums.c:594
+#, fuzzy
+#| msgid "_Huge"
+msgctxt "view-size"
 msgid "Huge"
-msgstr ""
+msgstr "�ห��_มา�"
 
-#: ../app/core/core-enums.c:579
+#: ../app/core/core-enums.c:595
+#, fuzzy
+#| msgid "_Enormous"
+msgctxt "view-size"
 msgid "Enormous"
-msgstr ""
+msgstr "�ห��ม_หึมา"
 
-#: ../app/core/core-enums.c:580
+#: ../app/core/core-enums.c:596
+#, fuzzy
+#| msgid "_Gigantic"
+msgctxt "view-size"
 msgid "Gigantic"
-msgstr ""
+msgstr "�ห��ม�ห_ฬาร"
 
-#: ../app/core/core-enums.c:607
+#: ../app/core/core-enums.c:624
+#, fuzzy
+#| msgid "View as list"
+msgctxt "view-type"
 msgid "View as list"
 msgstr "�ส������ราย�าร"
 
-#: ../app/core/core-enums.c:608
+#: ../app/core/core-enums.c:625
+#, fuzzy
+#| msgid "View as grid"
+msgctxt "view-type"
 msgid "View as grid"
 msgstr "�ส�������สั��ิ�ั�"
 
-#: ../app/core/core-enums.c:670
+#: ../app/core/core-enums.c:691
+#, fuzzy
+#| msgid "No thumbnails"
+msgctxt "thumbnail-size"
 msgid "No thumbnails"
 msgstr "�ม�มีรู�ย�อ"
 
-#: ../app/core/core-enums.c:671
+#: ../app/core/core-enums.c:692
+#, fuzzy
+#| msgid "Normal (128x128)"
+msgctxt "thumbnail-size"
 msgid "Normal (128x128)"
 msgstr "���ิ (128x128)"
 
-#: ../app/core/core-enums.c:672
+#: ../app/core/core-enums.c:693
+#, fuzzy
+#| msgid "Large (256x256)"
+msgctxt "thumbnail-size"
 msgid "Large (256x256)"
 msgstr "�ห�� (256x256)"
 
-#: ../app/core/core-enums.c:847
+#: ../app/core/core-enums.c:870
+#, fuzzy
+#| msgid "<<invalid>>"
+msgctxt "undo-type"
 msgid "<<invalid>>"
 msgstr "<<�ม�มี�ล>>"
 
-#: ../app/core/core-enums.c:848
+#: ../app/core/core-enums.c:871
+#, fuzzy
+#| msgid "Scale image"
+msgctxt "undo-type"
 msgid "Scale image"
 msgstr "�รั�สั�ส�ว�ภา�"
 
-#: ../app/core/core-enums.c:849
+#: ../app/core/core-enums.c:872
+#, fuzzy
+#| msgid "Resize image"
+msgctxt "undo-type"
 msgid "Resize image"
 msgstr "�รั���า�ภา�"
 
-#: ../app/core/core-enums.c:850
+#: ../app/core/core-enums.c:873
+#, fuzzy
+#| msgid "Flip image"
+msgctxt "undo-type"
 msgid "Flip image"
 msgstr "�ลั�ภา�"
 
-#: ../app/core/core-enums.c:851
+#: ../app/core/core-enums.c:874
+#, fuzzy
+#| msgid "Rotate image"
+msgctxt "undo-type"
 msgid "Rotate image"
 msgstr "หมุ�ภา�"
 
-#: ../app/core/core-enums.c:852
+#: ../app/core/core-enums.c:875
+#, fuzzy
+#| msgid "Crop image"
+msgctxt "undo-type"
 msgid "Crop image"
 msgstr "�ั��รอ�ภา�"
 
-#: ../app/core/core-enums.c:853
+#: ../app/core/core-enums.c:876
+#, fuzzy
+#| msgid "Convert image"
+msgctxt "undo-type"
 msgid "Convert image"
 msgstr "��ล�ระ��ภา�"
 
-#: ../app/core/core-enums.c:854
+#: ../app/core/core-enums.c:877
+#, fuzzy
+#| msgid "Remove item"
+msgctxt "undo-type"
 msgid "Remove item"
 msgstr "ล��ิ��วั��ุ"
 
-#: ../app/core/core-enums.c:855
+#: ../app/core/core-enums.c:878
+#, fuzzy
+#| msgid "Merge layers"
+msgctxt "undo-type"
 msgid "Merge layers"
 msgstr "รวม�ั���า��ั��หม�"
 
-#: ../app/core/core-enums.c:856
+#: ../app/core/core-enums.c:879
+#, fuzzy
+#| msgid "Merge paths"
+msgctxt "undo-type"
 msgid "Merge paths"
 msgstr "รวม�ส���า��ั��หม�"
 
-#: ../app/core/core-enums.c:858 ../app/core/core-enums.c:888
-msgid "Guide"
-msgstr "�ส���ำ��ว"
+#: ../app/core/core-enums.c:880
+#, fuzzy
+#| msgid "Quick Mask"
+msgctxt "undo-type"
+msgid "Quick Mask"
+msgstr "ห��า�า�ภา���ว�"
 
-#: ../app/core/core-enums.c:859 ../app/core/core-enums.c:889
-#: ../app/core/gimpimage-grid.c:58 ../app/dialogs/grid-dialog.c:150
-#: ../app/tools/tools-enums.c:211
+#: ../app/core/core-enums.c:881 ../app/core/core-enums.c:911
+#, fuzzy
+#| msgid "Grid"
+msgctxt "undo-type"
 msgid "Grid"
 msgstr "�ะ��ร�"
 
-#: ../app/core/core-enums.c:860 ../app/core/core-enums.c:890
+#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:913
+#, fuzzy
+#| msgid "Guide"
+msgctxt "undo-type"
+msgid "Guide"
+msgstr "�ส���ำ��ว"
+
+#: ../app/core/core-enums.c:883 ../app/core/core-enums.c:914
+#, fuzzy
+#| msgid "Sample Point"
+msgctxt "undo-type"
 msgid "Sample Point"
 msgstr "�ุ��ัวอย�า�"
 
-#: ../app/core/core-enums.c:861 ../app/core/core-enums.c:892
+#: ../app/core/core-enums.c:884 ../app/core/core-enums.c:915
+#, fuzzy
+#| msgid "Layer/Channel"
+msgctxt "undo-type"
 msgid "Layer/Channel"
 msgstr "�ั���า�/�����ล"
 
-#: ../app/core/core-enums.c:862 ../app/core/core-enums.c:893
+#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:916
+#, fuzzy
+#| msgid "Layer/Channel modification"
+msgctxt "undo-type"
 msgid "Layer/Channel modification"
 msgstr "�าร������ั���า�/�����ล"
 
-#: ../app/core/core-enums.c:863 ../app/core/core-enums.c:894
+#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:917
+#, fuzzy
+#| msgid "Selection mask"
+msgctxt "undo-type"
 msgid "Selection mask"
 msgstr "ห��า�า��ื���ี��าร�ลือ�"
 
-#: ../app/core/core-enums.c:864 ../app/core/core-enums.c:897
+#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:921
+#, fuzzy
+#| msgid "Item visibility"
+msgctxt "undo-type"
 msgid "Item visibility"
 msgstr "�ารมอ��ห��วั��ุ"
 
-#: ../app/core/core-enums.c:865 ../app/core/core-enums.c:898
+#: ../app/core/core-enums.c:888 ../app/core/core-enums.c:922
+#, fuzzy
+#| msgid "Link/Unlink item"
+msgctxt "undo-type"
 msgid "Link/Unlink item"
 msgstr "��ื�อม�ย�/�ม���ื�อม�ย��ิ��วั��ุ"
 
-#: ../app/core/core-enums.c:866
+#: ../app/core/core-enums.c:889
 #, fuzzy
+msgctxt "undo-type"
 msgid "Item properties"
 msgstr "�ุ�สม�ั�ิ�ิ��วั��ุ"
 
-#: ../app/core/core-enums.c:867 ../app/core/core-enums.c:896
+#: ../app/core/core-enums.c:890 ../app/core/core-enums.c:920
+#, fuzzy
+#| msgid "Move item"
+msgctxt "undo-type"
 msgid "Move item"
 msgstr "��ลื�อ�ย�าย�ิ��วั��ุ"
 
-#: ../app/core/core-enums.c:868
+#: ../app/core/core-enums.c:891
+#, fuzzy
+#| msgid "Scale item"
+msgctxt "undo-type"
 msgid "Scale item"
 msgstr "��ิ�ม-ล���า��ิ��วั��ุ"
 
-#: ../app/core/core-enums.c:869
+#: ../app/core/core-enums.c:892
 #, fuzzy
+msgctxt "undo-type"
 msgid "Resize item"
 msgstr "�รั���า��ิ��วั��ุ"
 
-#: ../app/core/core-enums.c:870 ../app/core/core-enums.c:907
+#: ../app/core/core-enums.c:893
+#, fuzzy
+#| msgid "Add Layer"
+msgctxt "undo-type"
+msgid "Add layer"
+msgstr "��ิ�ม�ั���า�"
+
+#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:933
+#, fuzzy
+#| msgid "Add layer mask"
+msgctxt "undo-type"
 msgid "Add layer mask"
 msgstr "��ิ�ม�ั���า�ห��า�า�"
 
-#: ../app/core/core-enums.c:871 ../app/core/core-enums.c:909
+#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:935
+#, fuzzy
+#| msgid "Apply layer mask"
+msgctxt "undo-type"
 msgid "Apply layer mask"
 msgstr "�ระยุ������ห��า�า��ั���า�"
 
-#: ../app/core/core-enums.c:872 ../app/core/core-enums.c:919
+#: ../app/core/core-enums.c:896 ../app/core/core-enums.c:943
+#, fuzzy
+#| msgid "Floating selection to layer"
+msgctxt "undo-type"
 msgid "Floating selection to layer"
 msgstr "��ล��ื���ี��าร�ลือ����ลอย�������ั���า�"
 
-#: ../app/core/core-enums.c:873
+#: ../app/core/core-enums.c:897
+#, fuzzy
+#| msgid "Float selection"
+msgctxt "undo-type"
 msgid "Float selection"
 msgstr "�ำ�ห�ว�ื���ี��ลือ�������ลอย�ัว�"
 
-#: ../app/core/core-enums.c:874
+#: ../app/core/core-enums.c:898
+#, fuzzy
+#| msgid "Anchor floating selection"
+msgctxt "undo-type"
 msgid "Anchor floating selection"
 msgstr "�ั��ัว�ื���ี��ลือ�ลอย�ัว"
 
-#: ../app/core/core-enums.c:875
-msgid "Remove floating selection"
-msgstr "�อา�ื���ี��ลือ�ลอย�ัวออ�"
-
-#: ../app/core/core-enums.c:876 ../app/core/gimp-edit.c:253
+#: ../app/core/core-enums.c:899
+#, fuzzy
+#| msgid "Paste"
+msgctxt "undo-type"
 msgid "Paste"
 msgstr "��ะ"
 
-#: ../app/core/core-enums.c:877 ../app/core/gimp-edit.c:489
+#: ../app/core/core-enums.c:900
+#, fuzzy
+#| msgid "Cut"
+msgctxt "undo-type"
 msgid "Cut"
 msgstr "�ั�"
 
-#: ../app/core/core-enums.c:878 ../app/tools/gimptexttool.c:143
-#: ../app/widgets/widgets-enums.c:263
+#: ../app/core/core-enums.c:901
+#, fuzzy
+#| msgid "Text"
+msgctxt "undo-type"
 msgid "Text"
 msgstr "��อ�วาม"
 
-#: ../app/core/core-enums.c:879 ../app/core/core-enums.c:922
-#: ../app/core/gimpdrawable-transform.c:1060
+#: ../app/core/core-enums.c:902 ../app/core/core-enums.c:944
+#, fuzzy
+#| msgid "Transform"
+msgctxt "undo-type"
 msgid "Transform"
 msgstr "��ลี�ย�รู�ร�า�"
 
-#: ../app/core/core-enums.c:880 ../app/core/core-enums.c:923
-#: ../app/paint/gimppaintcore.c:131
+#: ../app/core/core-enums.c:903 ../app/core/core-enums.c:945
+#, fuzzy
+#| msgid "Paint"
+msgctxt "undo-type"
 msgid "Paint"
 msgstr "�าสี"
 
-#: ../app/core/core-enums.c:881 ../app/core/core-enums.c:926
+#: ../app/core/core-enums.c:904 ../app/core/core-enums.c:948
+msgctxt "undo-type"
 msgid "Attach parasite"
 msgstr ""
 
-#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:927
+#: ../app/core/core-enums.c:905 ../app/core/core-enums.c:949
+#, fuzzy
+#| msgid "Remove item"
+msgctxt "undo-type"
 msgid "Remove parasite"
-msgstr ""
+msgstr "ล��ิ��วั��ุ"
 
-#: ../app/core/core-enums.c:883
+#: ../app/core/core-enums.c:906
+#, fuzzy
+#| msgid "Import paths"
+msgctxt "undo-type"
 msgid "Import paths"
 msgstr "�ำ���า�ส���า�"
 
-#: ../app/core/core-enums.c:884 ../app/pdb/drawable_cmds.c:770
+#: ../app/core/core-enums.c:907
+#, fuzzy
+#| msgid "Plug-In"
+msgctxt "undo-type"
 msgid "Plug-In"
 msgstr "��ร��รม�สริม"
 
-#: ../app/core/core-enums.c:885
+#: ../app/core/core-enums.c:908
+#, fuzzy
+#| msgid "Image type"
+msgctxt "undo-type"
 msgid "Image type"
 msgstr "��ิ�ภา�"
 
-#: ../app/core/core-enums.c:886
+#: ../app/core/core-enums.c:909
+#, fuzzy
+#| msgid "Image size"
+msgctxt "undo-type"
 msgid "Image size"
 msgstr "��า�ภา�"
 
-#: ../app/core/core-enums.c:887
+#: ../app/core/core-enums.c:910
 #, fuzzy
+msgctxt "undo-type"
 msgid "Image resolution change"
 msgstr "��ลี�ย��วามละ�อีย�"
 
-#: ../app/core/core-enums.c:891
+#: ../app/core/core-enums.c:912
+#, fuzzy
+#| msgid "Change indexed palette"
+msgctxt "undo-type"
 msgid "Change indexed palette"
 msgstr "��ลี�ย��ารา��ั��ี�า�สี"
 
-#: ../app/core/core-enums.c:895
+#: ../app/core/core-enums.c:918
+#, fuzzy
+#| msgid "Remove item"
+msgctxt "undo-type"
+msgid "Reorder item"
+msgstr "ล��ิ��วั��ุ"
+
+#: ../app/core/core-enums.c:919
+#, fuzzy
+#| msgid "Rename item"
+msgctxt "undo-type"
 msgid "Rename item"
 msgstr "��ลี�ย��ื�อ�ิ��วั��ุ"
 
-#: ../app/core/core-enums.c:899
+#: ../app/core/core-enums.c:923
+#, fuzzy
+#| msgid "New layer"
+msgctxt "undo-type"
 msgid "New layer"
 msgstr "�ั���า��หม�"
 
-#: ../app/core/core-enums.c:900
+#: ../app/core/core-enums.c:924
+#, fuzzy
+#| msgid "Delete layer"
+msgctxt "undo-type"
 msgid "Delete layer"
 msgstr "ล��ั���า�"
 
-#: ../app/core/core-enums.c:901
+#: ../app/core/core-enums.c:925
 #, fuzzy
-msgid "Reposition layer"
-msgstr "�ั��ำ�ห����ั���า��หม�"
-
-#: ../app/core/core-enums.c:902
+#| msgid "Set layer mode"
+msgctxt "undo-type"
 msgid "Set layer mode"
 msgstr "�ั����ารู�����ั���า�"
 
-#: ../app/core/core-enums.c:903
+#: ../app/core/core-enums.c:926
+#, fuzzy
+#| msgid "Set layer opacity"
+msgctxt "undo-type"
 msgid "Set layer opacity"
 msgstr "�ั����า�วาม�ึ��ั���า�"
 
-#: ../app/core/core-enums.c:904
+#: ../app/core/core-enums.c:927
 #, fuzzy
+msgctxt "undo-type"
 msgid "Lock/Unlock alpha channel"
 msgstr "��อ�ภา�อัล_�า�อ��ั���า�"
 
-#: ../app/core/core-enums.c:905
+#: ../app/core/core-enums.c:928
+msgctxt "undo-type"
+msgid "Suspend group layer resize"
+msgstr ""
+
+#: ../app/core/core-enums.c:929
+msgctxt "undo-type"
+msgid "Resume group layer resize"
+msgstr ""
+
+#: ../app/core/core-enums.c:930
 #, fuzzy
+#| msgid "Convert Edge"
+msgctxt "undo-type"
+msgid "Convert group layer"
+msgstr "��รสภา��อ�"
+
+#: ../app/core/core-enums.c:931
+#, fuzzy
+msgctxt "undo-type"
 msgid "Text layer"
 msgstr "�ั���า���อ�วาม"
 
-#: ../app/core/core-enums.c:906
+#: ../app/core/core-enums.c:932
 #, fuzzy
+msgctxt "undo-type"
 msgid "Text layer modification"
 msgstr "�ั����ารู�����ั���า�"
 
-#: ../app/core/core-enums.c:908
+#: ../app/core/core-enums.c:934
+#, fuzzy
+#| msgid "Delete layer mask"
+msgctxt "undo-type"
 msgid "Delete layer mask"
 msgstr "ล��ั���า�ห��า�า�"
 
-#: ../app/core/core-enums.c:910
+#: ../app/core/core-enums.c:936
 #, fuzzy
+msgctxt "undo-type"
 msgid "Show layer mask"
 msgstr "�ส���ั��ห��า�า�"
 
-#: ../app/core/core-enums.c:911
+#: ../app/core/core-enums.c:937
+#, fuzzy
+#| msgid "New channel"
+msgctxt "undo-type"
 msgid "New channel"
 msgstr "�����ล�หม�"
 
-#: ../app/core/core-enums.c:912
+#: ../app/core/core-enums.c:938
+#, fuzzy
+#| msgid "Delete channel"
+msgctxt "undo-type"
 msgid "Delete channel"
 msgstr "ล������ล"
 
-#: ../app/core/core-enums.c:913
-#, fuzzy
-msgid "Reposition channel"
-msgstr "�ั��ำ�ห��������ล�หม�"
-
-#: ../app/core/core-enums.c:914
+#: ../app/core/core-enums.c:939
 #, fuzzy
+msgctxt "undo-type"
 msgid "Channel color"
 msgstr "�����ล�อ�สี"
 
-#: ../app/core/core-enums.c:915
+#: ../app/core/core-enums.c:940
 #, fuzzy
+msgctxt "undo-type"
 msgid "New path"
 msgstr "�ส���า��หม�"
 
-#: ../app/core/core-enums.c:917
+#: ../app/core/core-enums.c:941
 #, fuzzy
+#| msgid "Delete path"
+msgctxt "undo-type"
+msgid "Delete path"
+msgstr "ล��ส���า�"
+
+#: ../app/core/core-enums.c:942
+#, fuzzy
+msgctxt "undo-type"
 msgid "Path modification"
 msgstr "��ล��ส���า������ี���ี��ลือ�"
 
-#: ../app/core/core-enums.c:918
+#: ../app/core/core-enums.c:946
 #, fuzzy
-msgid "Reposition path"
-msgstr "��ล��ี���ี��ลือ������ส���า�"
-
-#: ../app/core/core-enums.c:920
-msgid "FS rigor"
-msgstr ""
-
-#: ../app/core/core-enums.c:921
-msgid "FS relax"
-msgstr ""
-
-#: ../app/core/core-enums.c:924 ../app/paint/gimpink.c:103
-#: ../app/tools/gimpinktool.c:55
+#| msgid "Ink"
+msgctxt "undo-type"
 msgid "Ink"
 msgstr "หมึ�"
 
-#: ../app/core/core-enums.c:925
+#: ../app/core/core-enums.c:947
 #, fuzzy
+msgctxt "undo-type"
 msgid "Select foreground"
 msgstr "��ลี�ย��ี�สี�ื��ห��า"
 
-#: ../app/core/core-enums.c:928
-msgid "EEK: can't undo"
+#: ../app/core/core-enums.c:950
+msgctxt "undo-type"
+msgid "Not undoable"
 msgstr ""
 
-#: ../app/core/core-enums.c:1192
+#: ../app/core/core-enums.c:1222
 #, fuzzy
+msgctxt "select-criterion"
 msgid "Composite"
 msgstr "หมาย�ห�ุ"
 
-#: ../app/core/gimp-contexts.c:141 ../app/gui/session.c:252
-#: ../app/menus/menus.c:422 ../app/tools/gimp-tools.c:441
-#: ../app/widgets/gimpdevices.c:258
+#: ../app/core/core-enums.c:1223
+#, fuzzy
+#| msgid "Red"
+msgctxt "select-criterion"
+msgid "Red"
+msgstr "สี���"
+
+#: ../app/core/core-enums.c:1224
+#, fuzzy
+#| msgid "Green"
+msgctxt "select-criterion"
+msgid "Green"
+msgstr "สี��ียว"
+
+#: ../app/core/core-enums.c:1225
+#, fuzzy
+#| msgid "Blue"
+msgctxt "select-criterion"
+msgid "Blue"
+msgstr "��ำ��ิ�"
+
+#: ../app/core/core-enums.c:1226
+#, fuzzy
+#| msgid "Hue:"
+msgctxt "select-criterion"
+msgid "Hue"
+msgstr "�า�ุสี:"
+
+#: ../app/core/core-enums.c:1227
+#, fuzzy
+#| msgid "Hue-Saturation"
+msgctxt "select-criterion"
+msgid "Saturation"
+msgstr "�า�ุสี-�วามอิ�มสี"
+
+#: ../app/core/core-enums.c:1228
+#, fuzzy
+#| msgid "Value"
+msgctxt "select-criterion"
+msgid "Value"
+msgstr "�วามสว�า�"
+
+#: ../app/core/core-enums.c:1257
+#, fuzzy
+#| msgid "%s Message"
+msgctxt "message-severity"
+msgid "Message"
+msgstr "��อ�วาม %s"
+
+#: ../app/core/core-enums.c:1258
+#, fuzzy
+msgctxt "message-severity"
+msgid "Warning"
+msgstr "�ำลั��ยื�อ�ภา�..."
+
+#: ../app/core/core-enums.c:1259
+#, fuzzy
+#| msgid "Errors"
+msgctxt "message-severity"
+msgid "Error"
+msgstr "��อ�ิ��ลา�"
+
+#: ../app/core/core-enums.c:1288
+msgctxt "color-profile-policy"
+msgid "Ask what to do"
+msgstr ""
+
+#: ../app/core/core-enums.c:1289
+msgctxt "color-profile-policy"
+msgid "Keep embedded profile"
+msgstr ""
+
+#: ../app/core/core-enums.c:1290
+#, fuzzy
+msgctxt "color-profile-policy"
+msgid "Convert to RGB workspace"
+msgstr "��ล���าสีภา�������� Indexed"
+
+#: ../app/core/core-enums.c:1327
+#, fuzzy
+#| msgid "Opacity"
+msgctxt "dynamics-output-type"
+msgid "Opacity"
+msgstr "�วาม�ึ��ส�"
+
+#: ../app/core/core-enums.c:1328
+#, fuzzy
+#| msgid "Size"
+msgctxt "dynamics-output-type"
+msgid "Size"
+msgstr "��า�"
+
+#: ../app/core/core-enums.c:1329
+#, fuzzy
+#| msgid "A_ngle"
+msgctxt "dynamics-output-type"
+msgid "Angle"
+msgstr "มุ_ม"
+
+#: ../app/core/core-enums.c:1330
+#, fuzzy
+#| msgid "Color"
+msgctxt "dynamics-output-type"
+msgid "Color"
+msgstr "สี"
+
+#: ../app/core/core-enums.c:1331
+#, fuzzy
+#| msgid "_Hardness"
+msgctxt "dynamics-output-type"
+msgid "Hardness"
+msgstr "�_วามห�ั�"
+
+#: ../app/core/core-enums.c:1332
+#, fuzzy
+#| msgid "Source"
+msgctxt "dynamics-output-type"
+msgid "Force"
+msgstr "�หล����อมูล"
+
+#: ../app/core/core-enums.c:1333
+msgctxt "dynamics-output-type"
+msgid "Aspect ratio"
+msgstr "สั�ส�ว�"
+
+#: ../app/core/core-enums.c:1334
+#, fuzzy
+#| msgid "Spacing"
+msgctxt "dynamics-output-type"
+msgid "Spacing"
+msgstr "ระยะห�า�"
+
+#: ../app/core/core-enums.c:1335
+#, fuzzy
+#| msgid "Rate:"
+msgctxt "dynamics-output-type"
+msgid "Rate"
+msgstr "อั�รา:"
+
+#: ../app/core/core-enums.c:1336
+#, fuzzy
+#| msgid "_Float"
+msgctxt "dynamics-output-type"
+msgid "Flow"
+msgstr "ลอ_ย�ัว"
+
+#: ../app/core/core-enums.c:1337
+#, fuzzy
+#| msgid "Miter"
+msgctxt "dynamics-output-type"
+msgid "Jitter"
+msgstr "�หลม"
+
+#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:326
+#: ../app/gui/session.c:349 ../app/menus/menus.c:464
+#: ../app/widgets/gimpdevices.c:269
 #, c-format
 msgid "Deleting \"%s\" failed: %s"
 msgstr "�ารล� \"%s\" ล�ม�หลว: %s"
 
-#: ../app/core/gimp-edit.c:181 ../app/core/gimp-edit.c:315
+#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:232
 msgid "Pasted Layer"
 msgstr "�ั���า��ี���ะ"
 
-#: ../app/core/gimp-edit.c:444
+#: ../app/core/gimp-edit.c:261
+msgid "Paste"
+msgstr "��ะ"
+
+#: ../app/core/gimp-edit.c:388
+msgid "Clear"
+msgstr "ล�ล�า�"
+
+#: ../app/core/gimp-edit.c:407
 #, fuzzy
 msgid "Fill with Foreground Color"
 msgstr "��ิม��วยสี�ื�_�หลั�"
 
-#: ../app/core/gimp-edit.c:448
+#: ../app/core/gimp-edit.c:411
 #, fuzzy
 msgid "Fill with Background Color"
 msgstr "��ิม��วยสี�ื�_�หลั�"
 
-#: ../app/core/gimp-edit.c:452
+#: ../app/core/gimp-edit.c:415
 msgid "Fill with White"
 msgstr "��ิม��วยสี�าว"
 
-#: ../app/core/gimp-edit.c:456
+#: ../app/core/gimp-edit.c:419
 msgid "Fill with Transparency"
 msgstr "��ิม��วย�วาม��ร���ส"
 
-#: ../app/core/gimp-edit.c:460
+#: ../app/core/gimp-edit.c:423
 msgid "Fill with Pattern"
 msgstr "��ิม��วย���ลาย"
 
-#: ../app/core/gimp-edit.c:514 ../app/core/gimpselection.c:627
-msgid "Unable to cut or copy because the selected region is empty."
-msgstr "�ม�สามาร��ั�หรือ�ั�ลอ���� ��ราะว�า�ื���ี��ี��ลือ������ึ���ี�ว�า�"
+#: ../app/core/gimp-edit.c:500
+msgid "Cut"
+msgstr "�ั�"
 
-#: ../app/core/gimp-edit.c:549
+#: ../app/core/gimp-edit.c:512
 #, fuzzy
 msgid "Global Buffer"
 msgstr "�_�ะ�ุ��ั���อมูล"
 
-#: ../app/core/gimp-gradients.c:60
+#: ../app/core/gimp-gradients.c:62
 msgid "FG to BG (RGB)"
 msgstr "�า�สี�ื��ห��าสู�สี�ี��หลั� (RGB)"
 
-#: ../app/core/gimp-gradients.c:65
+#: ../app/core/gimp-gradients.c:70
+#, fuzzy
+#| msgid "FG to BG (RGB)"
+msgid "FG to BG (Hardedge)"
+msgstr "�า�สี�ื��ห��าสู�สี�ี��หลั� (RGB)"
+
+#: ../app/core/gimp-gradients.c:87
 msgid "FG to BG (HSV counter-clockwise)"
 msgstr ""
 
-#: ../app/core/gimp-gradients.c:70
+#: ../app/core/gimp-gradients.c:95
 msgid "FG to BG (HSV clockwise hue)"
 msgstr ""
 
-#: ../app/core/gimp-gradients.c:75
+#: ../app/core/gimp-gradients.c:103
 msgid "FG to Transparent"
 msgstr "สี�ื��ห��าสู��วาม��ร���ส"
 
-#: ../app/core/gimp-user-install.c:194
+#. This is a special string to specify the language identifier to
+#. * look for in the gimp-tags-default.xml file. Please translate the
+#. * C in it according to the name of the po file used for
+#. * gimp-tags-default.xml. E.g. lithuanian for the translation,
+#. * that would be "tags-locale:lt".
+#.
+#: ../app/core/gimp-tags.c:88
+msgid "tags-locale:C"
+msgstr ""
+
+#: ../app/core/gimp-user-install.c:154
 #, c-format
 msgid ""
 "It seems you have used GIMP %s before.  GIMP will now migrate your user "
 "settings to '%s'."
 msgstr ""
 
-#: ../app/core/gimp-user-install.c:199
+#: ../app/core/gimp-user-install.c:159
 #, c-format
 msgid ""
 "It appears that you are using GIMP for the first time.  GIMP will now create "
 "a folder named '%s' and copy some files to it."
 msgstr ""
 
-#: ../app/core/gimp-user-install.c:301
+#: ../app/core/gimp-user-install.c:311
 #, c-format
 msgid "Copying file '%s' from '%s'..."
 msgstr "�ั�ลอ����ม '%s' �า� '%s'..."
 
-#: ../app/core/gimp-user-install.c:316
+#: ../app/core/gimp-user-install.c:326 ../app/core/gimp-user-install.c:352
 #, c-format
 msgid "Creating folder '%s'..."
 msgstr "�ำลั�สร�า���ล��อร� '%s'..."
 
-#: ../app/core/gimp-user-install.c:327
+#: ../app/core/gimp-user-install.c:337 ../app/core/gimp-user-install.c:363
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "�ม�สามาร�สร�า���ล��อร� '%s': %s ���"
 
-#: ../app/core/gimp.c:519
+#: ../app/core/gimp.c:595
 #, fuzzy
 msgid "Initialization"
 msgstr "��อ��ั��อ�หยั�"
 
 #. register all internal procedures
-#: ../app/core/gimp.c:594
+#: ../app/core/gimp.c:696
 #, fuzzy
 msgid "Internal Procedures"
 msgstr "�ั���อ�ภาย��"
 
 #. initialize  the global parasite table
-#: ../app/core/gimp.c:811
+#: ../app/core/gimp.c:947
 msgid "Looking for data files"
 msgstr "�ำลั�หา��ล���อมูล"
 
-#: ../app/core/gimp.c:811
+#: ../app/core/gimp.c:947
 msgid "Parasites"
 msgstr ""
 
-#. initialize the document history
-#: ../app/core/gimp.c:836
-msgid "Documents"
-msgstr "�ิ���า���า��"
+#. initialize the list of gimp dynamics
+#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2724
+msgid "Dynamics"
+msgstr ""
+
+#. initialize the list of fonts
+#: ../app/core/gimp.c:976
+msgid "Fonts (this may take a while)"
+msgstr ""
 
 #. initialize the module list
-#: ../app/core/gimp.c:844 ../app/dialogs/preferences-dialog.c:2596
+#: ../app/core/gimp.c:990 ../app/dialogs/preferences-dialog.c:2752
 #, fuzzy
 msgid "Modules"
 msgstr "��ร��รมย�อย"
 
-#: ../app/core/gimpbrush-load.c:152
+#. update tag cache
+#: ../app/core/gimp.c:994
+msgid "Updating tag cache"
+msgstr ""
+
+#: ../app/core/gimpbrush-load.c:178
 #, c-format
 msgid "Could not read %d bytes from '%s': %s"
 msgstr "�ม�สามาร�อ�า���� %d ���� �า� '%s': %s"
 
-#: ../app/core/gimpbrush-load.c:172
+#: ../app/core/gimpbrush-load.c:198
 #, c-format
 msgid "Fatal parse error in brush file '%s': Width = 0."
 msgstr ""
 
-#: ../app/core/gimpbrush-load.c:181
+#: ../app/core/gimpbrush-load.c:207
 #, c-format
 msgid "Fatal parse error in brush file '%s': Height = 0."
 msgstr ""
 
-#: ../app/core/gimpbrush-load.c:190
+#: ../app/core/gimpbrush-load.c:216
 #, c-format
 msgid "Fatal parse error in brush file '%s': Bytes = 0."
 msgstr ""
 
-#: ../app/core/gimpbrush-load.c:214
+#: ../app/core/gimpbrush-load.c:240
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown depth %d."
 msgstr ""
 
-#: ../app/core/gimpbrush-load.c:227
+#: ../app/core/gimpbrush-load.c:253
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown version %d."
 msgstr ""
 
-#: ../app/core/gimpbrush-load.c:243 ../app/core/gimpbrush-load.c:363
+#: ../app/core/gimpbrush-load.c:269 ../app/core/gimpbrush-load.c:389
+#: ../app/core/gimpbrush-load.c:722
 #, c-format
 msgid "Fatal parse error in brush file '%s': File appears truncated."
 msgstr ""
 
-#: ../app/core/gimpbrush-load.c:251 ../app/core/gimpbrushgenerated.c:614
-#: ../app/core/gimpbrushpipe.c:330
+#: ../app/core/gimpbrush-load.c:277 ../app/core/gimpbrushgenerated-load.c:128
+#: ../app/core/gimpbrushpipe-load.c:97
 #, c-format
 msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "��อ�วาม��� UTF-8 �ม�มี��า����ล�หัว��ร� '%s'"
 
-#: ../app/core/gimpbrush-load.c:258 ../app/core/gimpitem.c:538
-#: ../app/core/gimppattern.c:335 ../app/dialogs/template-options-dialog.c:82
-#: ../app/tools/gimpvectortool.c:295
+#: ../app/core/gimpbrush-load.c:284 ../app/core/gimppattern-load.c:146
+#: ../app/dialogs/template-options-dialog.c:82
+#: ../app/tools/gimpvectortool.c:319
 msgid "Unnamed"
 msgstr "�ม�����ั���ื�อ"
 
-#: ../app/core/gimpbrush-load.c:352
+#: ../app/core/gimpbrush-load.c:378
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': Unsupported brush depth %d\n"
 "GIMP brushes must be GRAY or RGBA."
 msgstr ""
 
-#: ../app/core/gimpbrush-load.c:408
+#: ../app/core/gimpbrush-load.c:450
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': unable to decode abr format version %d."
 msgstr ""
 
-#: ../app/core/gimpbrush-load.c:425
+#: ../app/core/gimpbrush-load.c:617
 #, fuzzy, c-format
-msgid "Fatal parse error in brush file '%s'"
+msgid "Fatal parse error in brush file '%s': Wide brushes are not supported."
 msgstr "��อ�วาม��� UTF-8 �ม�มี��า����ล�หัว��ร� '%s'"
 
-#: ../app/core/gimpbrushclipboard.c:181 ../app/core/gimppatternclipboard.c:181
-#: ../app/widgets/gimpclipboard.c:296
-msgid "Clipboard"
-msgstr "�ลิ��อร��"
+#: ../app/core/gimpbrush.c:136
+#, fuzzy
+#| msgid "Spacing"
+msgid "Brush Spacing"
+msgstr "ระยะห�า�"
 
-#: ../app/core/gimpbrushgenerated.c:575
+#: ../app/core/gimpbrushgenerated-load.c:87
 #, c-format
 msgid "Fatal parse error in brush file '%s': Not a GIMP brush file."
 msgstr ""
 
-#: ../app/core/gimpbrushgenerated.c:591
-#, c-format
-msgid "Fatal parse error in brush file '%s': Unknown GIMP brush version."
-msgstr ""
+#: ../app/core/gimpbrushgenerated-load.c:104
+#, fuzzy, c-format
+msgid ""
+"Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d."
+msgstr "��อ�วาม��� UTF-8 �ม�มี��า����ล�หัว��ร� '%s'"
+
+#: ../app/core/gimpbrushgenerated-load.c:150
+#, fuzzy, c-format
+msgid ""
+"Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d."
+msgstr "��อ�วาม��� UTF-8 �ม�มี��า����ล�หัว��ร� '%s'"
+
+#: ../app/core/gimpbrushgenerated-load.c:226
+#, fuzzy, c-format
+msgid "Line %d: %s"
+msgstr "�วาม�ว�า��ส��:"
 
-#: ../app/core/gimpbrushgenerated.c:635
+#: ../app/core/gimpbrushgenerated-load.c:228
 #, c-format
-msgid "Fatal parse error in brush file '%s': Unknown GIMP brush shape."
+msgid "File is truncated in line %d"
 msgstr ""
 
-#: ../app/core/gimpbrushgenerated.c:702
+#: ../app/core/gimpbrushgenerated-load.c:231
 #, c-format
 msgid "Error while reading brush file '%s': %s"
 msgstr "��ิ���อ�ิ��ลา���ะอ�า���ล�หัว��ร� '%s': %s"
 
-#: ../app/core/gimpbrushgenerated.c:704
-msgid "File is truncated"
-msgstr ""
+#: ../app/core/gimpbrushgenerated.c:129
+#, fuzzy
+#| msgid "Brushes"
+msgid "Brush Shape"
+msgstr "หัว��ร�"
+
+#: ../app/core/gimpbrushgenerated.c:137
+#, fuzzy
+#| msgid "Brush Editor"
+msgid "Brush Radius"
+msgstr "��รื�อ�มือ�����หัว��ร�"
+
+#: ../app/core/gimpbrushgenerated.c:144
+#, fuzzy
+#| msgid "Brushes"
+msgid "Brush Spikes"
+msgstr "หัว��ร�"
+
+#: ../app/core/gimpbrushgenerated.c:151
+#, fuzzy
+#| msgid "_Hardness"
+msgid "Brush Hardness"
+msgstr "�_วามห�ั�"
+
+#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:141
+#, fuzzy
+#| msgid "Aspect ratio:"
+msgid "Brush Aspect Ratio"
+msgstr "สั�ส�ว�:"
+
+#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:145
+#, fuzzy
+#| msgid "Brushes"
+msgid "Brush Angle"
+msgstr "หัว��ร�"
 
-#: ../app/core/gimpbrushpipe.c:346 ../app/core/gimpbrushpipe.c:366
-#: ../app/core/gimpbrushpipe.c:456
+#: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133
+#: ../app/core/gimpbrushpipe-load.c:224
 #, c-format
 msgid "Fatal parse error in brush file '%s': File is corrupt."
 msgstr ""
 
-#: ../app/core/gimpchannel-select.c:57
+#: ../app/core/gimpchannel-select.c:59
 #, fuzzy
-msgid "command|Rectangle Select"
+msgctxt "command"
+msgid "Rectangle Select"
 msgstr "สี��หลี�ยมมุม�า�"
 
-#: ../app/core/gimpchannel-select.c:108
+#: ../app/core/gimpchannel-select.c:110
 #, fuzzy
-msgid "command|Ellipse Select"
+#| msgid "Ellipse Select"
+msgctxt "command"
+msgid "Ellipse Select"
 msgstr "ว�รี"
 
-#: ../app/core/gimpchannel-select.c:374
+#: ../app/core/gimpchannel-select.c:164
+#, fuzzy
+msgctxt "command"
+msgid "Rounded Rectangle Select"
+msgstr "สี��หลี�ยมมุม�า�"
+
+#: ../app/core/gimpchannel-select.c:433
 msgid "Alpha to Selection"
 msgstr "��ล���าอัล�า�����าร�ลือ��ื���ี�"
 
-#: ../app/core/gimpchannel-select.c:412
+#: ../app/core/gimpchannel-select.c:471
 #, c-format
 msgid "%s Channel to Selection"
 msgstr "%s �����ลสู��าร�ลือ��ื���ี�"
 
-#: ../app/core/gimpchannel-select.c:460 ../app/tools/gimpfuzzyselecttool.c:78
+#: ../app/core/gimpchannel-select.c:519 ../app/tools/gimpfuzzyselecttool.c:80
 #, fuzzy
-msgid "command|Fuzzy Select"
+#| msgid "Fuzzy Select"
+msgctxt "command"
+msgid "Fuzzy Select"
 msgstr "�ลือ�สุ�มสี"
 
-#: ../app/core/gimpchannel-select.c:507
-#: ../app/tools/gimpbycolorselecttool.c:80
+#: ../app/core/gimpchannel-select.c:566
+#: ../app/tools/gimpbycolorselecttool.c:82
 #, fuzzy
-msgid "command|Select by Color"
+#| msgid "Select by Color"
+msgctxt "command"
+msgid "Select by Color"
 msgstr "�ลือ��า�สี"
 
-#: ../app/core/gimpchannel.c:256
-msgid "Channel"
-msgstr "�����ล"
-
-#: ../app/core/gimpchannel.c:257
+#: ../app/core/gimpchannel.c:264
 msgid "Rename Channel"
 msgstr "��ลี�ย��ื�อ�����ล"
 
-#: ../app/core/gimpchannel.c:258
+#: ../app/core/gimpchannel.c:265
 msgid "Move Channel"
 msgstr "��ลื�อ�ย�าย�����ล"
 
-#: ../app/core/gimpchannel.c:259
+#: ../app/core/gimpchannel.c:266
 msgid "Scale Channel"
 msgstr "�รั�สั�ส�ว������ล"
 
-#: ../app/core/gimpchannel.c:260
+#: ../app/core/gimpchannel.c:267
 msgid "Resize Channel"
 msgstr "�รั���า������ล"
 
-#: ../app/core/gimpchannel.c:261
+#: ../app/core/gimpchannel.c:268
 msgid "Flip Channel"
 msgstr "�ลั������ล"
 
-#: ../app/core/gimpchannel.c:262
+#: ../app/core/gimpchannel.c:269
 msgid "Rotate Channel"
 msgstr "หมุ������ล"
 
-#: ../app/core/gimpchannel.c:263 ../app/core/gimpdrawable-transform.c:1327
+#: ../app/core/gimpchannel.c:270 ../app/core/gimpdrawable-transform.c:885
 msgid "Transform Channel"
 msgstr "��ลี�ย�รู�ร�า������ล"
 
-#: ../app/core/gimpchannel.c:264
+#: ../app/core/gimpchannel.c:271
 msgid "Stroke Channel"
 msgstr "�ี�ส�������ล"
 
-#: ../app/core/gimpchannel.c:285
+#: ../app/core/gimpchannel.c:293
 msgid "Feather Channel"
 msgstr "�ำ�����ล�ห�มัว"
 
-#: ../app/core/gimpchannel.c:286
+#: ../app/core/gimpchannel.c:294
 msgid "Sharpen Channel"
 msgstr "�ำ�����ล�ห��ั�"
 
-#: ../app/core/gimpchannel.c:287
+#: ../app/core/gimpchannel.c:295
 msgid "Clear Channel"
 msgstr "ล�า������ล"
 
-#: ../app/core/gimpchannel.c:288
+#: ../app/core/gimpchannel.c:296
 msgid "Fill Channel"
 msgstr "��ิมล��������ล"
 
-#: ../app/core/gimpchannel.c:289
+#: ../app/core/gimpchannel.c:297
 msgid "Invert Channel"
 msgstr "�ลั���าสี�����ล"
 
-#: ../app/core/gimpchannel.c:290
+#: ../app/core/gimpchannel.c:298
 msgid "Border Channel"
 msgstr "�อ������ล"
 
-#: ../app/core/gimpchannel.c:291
+#: ../app/core/gimpchannel.c:299
 msgid "Grow Channel"
 msgstr "�ยาย�����ล"
 
-#: ../app/core/gimpchannel.c:292
+#: ../app/core/gimpchannel.c:300
 msgid "Shrink Channel"
 msgstr "ล���า������ล"
 
-#: ../app/core/gimpchannel.c:687
+#: ../app/core/gimpchannel.c:712
 msgid "Cannot stroke empty channel."
 msgstr "�ม�สามาร��ี�ส�������ล��ล�า���"
 
-#: ../app/core/gimpchannel.c:1587
+#: ../app/core/gimpchannel.c:1715
 msgid "Set Channel Color"
 msgstr "�ั����าสี�����ล"
 
-#: ../app/core/gimpchannel.c:1635
+#: ../app/core/gimpchannel.c:1781
 msgid "Set Channel Opacity"
 msgstr "�ั����า�วาม�ึ������ล"
 
-#: ../app/core/gimpchannel.c:1703 ../app/core/gimpselection.c:522
+#: ../app/core/gimpchannel.c:1889 ../app/core/gimpselection.c:532
 msgid "Selection Mask"
 msgstr "ห��า�า��ื���ี��าร�ลือ�"
 
-#: ../app/core/gimpdata.c:446
+#: ../app/core/gimpcontext.c:650
+msgid "Opacity"
+msgstr "�วาม�ึ��ส�"
+
+#: ../app/core/gimpcontext.c:658
+#, fuzzy
+#| msgid "Paint _Mode"
+msgid "Paint Mode"
+msgstr "�หม��าร_�าสี"
+
+#: ../app/core/gimpdata.c:679 ../app/core/gimptoolpresets.c:277
 #, c-format
 msgid "Could not delete '%s': %s"
 msgstr "�ม�สามาร�ล� '%s': %s���"
 
-#: ../app/core/gimpdatafactory.c:406 ../app/core/gimpdatafactory.c:578
+#: ../app/core/gimpdatafactory.c:427 ../app/core/gimpdatafactory.c:456
+#: ../app/core/gimpdatafactory.c:622 ../app/core/gimpdatafactory.c:644
 #, fuzzy, c-format
 msgid ""
 "Failed to save data:\n"
@@ -5645,17 +9069,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/core/gimpdatafactory.c:482 ../app/core/gimpdatafactory.c:485
-#: ../app/core/gimpitem.c:311 ../app/core/gimpitem.c:314
+#: ../app/core/gimpdatafactory.c:536 ../app/core/gimpdatafactory.c:539
+#: ../app/core/gimpitem.c:423 ../app/core/gimpitem.c:426
 msgid "copy"
 msgstr "�ั�ลอ�"
 
-#: ../app/core/gimpdatafactory.c:494 ../app/core/gimpitem.c:323
+#: ../app/core/gimpdatafactory.c:548 ../app/core/gimpitem.c:435
 #, c-format
 msgid "%s copy"
 msgstr "%s �ั�ลอ�"
 
-#: ../app/core/gimpdatafactory.c:719
+#: ../app/core/gimpdatafactory.c:741
+#, c-format
+msgid ""
+"You have a writable data folder configured (%s), but this folder does not "
+"exist. Please create the folder or fix your configuation in the Preferences "
+"dialog's 'Folders' section."
+msgstr ""
+
+#: ../app/core/gimpdatafactory.c:762
+#, c-format
+msgid ""
+"You have a writable data folder configured, but this folder is not part of "
+"your data search path. You probably edited the gimprc file manually, please "
+"fix it in the Preferences dialog's 'Folders' section."
+msgstr ""
+
+#: ../app/core/gimpdatafactory.c:772
+#, c-format
+msgid "You don't have any writable data folder configured."
+msgstr ""
+
+#: ../app/core/gimpdatafactory.c:889
 #, fuzzy, c-format
 msgid ""
 "Failed to load data:\n"
@@ -5666,151 +9111,265 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/core/gimpdrawable-blend.c:247 ../app/tools/gimpblendtool.c:106
+#: ../app/core/gimpdrawable-blend.c:244 ../app/tools/gimpblendtool.c:109
 msgid "Blend"
 msgstr "�สมสี"
 
-#: ../app/core/gimpdrawable-bucket-fill.c:86
+#: ../app/core/gimpdrawable-brightness-contrast.c:70
+msgid "Brightness_Contrast"
+msgstr ""
+
+#: ../app/core/gimpdrawable-brightness-contrast.c:81
+#: ../app/tools/gimpbrightnesscontrasttool.c:111
+msgid "Brightness-Contrast"
+msgstr ""
+
+#: ../app/core/gimpdrawable-bucket-fill.c:91
 msgid "No patterns available for this operation."
 msgstr "���ลาย�ม�สามาร��������ั��าร�ระ�ำ�ี�"
 
-#: ../app/core/gimpdrawable-bucket-fill.c:277
+#: ../app/core/gimpdrawable-bucket-fill.c:286
 #, fuzzy
-msgid "command|Bucket Fill"
+#| msgid "Bucket Fill"
+msgctxt "command"
+msgid "Bucket Fill"
 msgstr "��สี"
 
-#: ../app/core/gimpdrawable-desaturate.c:97
-#: ../app/dialogs/desaturate-dialog.c:62
+#: ../app/core/gimpdrawable-color-balance.c:79
+#: ../app/core/gimpdrawable-color-balance.c:89
+#: ../app/tools/gimpcolorbalancetool.c:94
+msgid "Color Balance"
+msgstr "สม�ุลสี"
+
+#: ../app/core/gimpdrawable-colorize.c:72
+#: ../app/core/gimpdrawable-colorize.c:84 ../app/tools/gimpcolorizetool.c:90
+msgid "Colorize"
+msgstr "ย�อมสี"
+
+#: ../app/core/gimpdrawable-curves.c:162 ../app/core/gimpdrawable-curves.c:179
+#: ../app/tools/gimpcurvestool.c:140
+msgid "Curves"
+msgstr ""
+
+#: ../app/core/gimpdrawable-desaturate.c:70
+#: ../app/core/gimpdrawable-desaturate.c:76
+#: ../app/tools/gimpdesaturatetool.c:77
 msgid "Desaturate"
 msgstr "�ม�มีสีสั�"
 
-#: ../app/core/gimpdrawable-equalize.c:77
+#: ../app/core/gimpdrawable-equalize.c:52
 msgid "Equalize"
 msgstr ""
 
-#: ../app/core/gimpdrawable-foreground-extract.c:138
+#: ../app/core/gimpdrawable-foreground-extract.c:133
 #, fuzzy
 msgid "Foreground Extraction"
 msgstr "สี�ื��ห��า"
 
-#: ../app/core/gimpdrawable-invert.c:61
+#: ../app/core/gimpdrawable-hue-saturation.c:77
+#: ../app/tools/gimphuesaturationtool.c:102
+msgid "Hue-Saturation"
+msgstr "�า�ุสี-�วามอิ�มสี"
+
+#: ../app/core/gimpdrawable-hue-saturation.c:87
+#, fuzzy
+#| msgid "Hue-Saturation"
+msgid "Hue_Saturation"
+msgstr "�า�ุสี-�วามอิ�มสี"
+
+#: ../app/core/gimpdrawable-invert.c:54 ../app/core/gimpdrawable-invert.c:62
 msgid "Invert"
 msgstr "�ลั���าสี"
 
-#: ../app/core/gimpdrawable-levels.c:110 ../app/core/gimpdrawable-levels.c:160
-#: ../app/tools/gimplevelstool.c:154
+#: ../app/core/gimpdrawable-levels.c:153 ../app/core/gimpdrawable-levels.c:169
+#: ../app/tools/gimplevelstool.c:150
 msgid "Levels"
 msgstr "ระ�ั���า��"
 
-#: ../app/core/gimpdrawable-offset.c:316
+#: ../app/core/gimpdrawable-offset.c:315
 msgid "Offset Drawable"
 msgstr ""
 
-#: ../app/core/gimpdrawable-stroke.c:319
+#: ../app/core/gimpdrawable-posterize.c:69
+#: ../app/core/gimpdrawable-posterize.c:79 ../app/tools/gimpposterizetool.c:84
+msgid "Posterize"
+msgstr ""
+
+#: ../app/core/gimpdrawable-stroke.c:435
 msgid "Render Stroke"
 msgstr ""
 
-#. Start a transform undo group
-#: ../app/core/gimpdrawable-transform.c:1121 ../app/tools/gimpfliptool.c:110
-msgid "command|Flip"
+#: ../app/core/gimpdrawable-threshold.c:70
+#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpthresholdtool.c:90
+msgid "Threshold"
 msgstr ""
 
-#. Start a transform undo group
-#: ../app/core/gimpdrawable-transform.c:1205 ../app/tools/gimprotatetool.c:114
+#: ../app/core/gimpdrawable-transform.c:566
+msgid "Transform"
+msgstr "��ลี�ย�รู�ร�า�"
+
+#: ../app/core/gimpdrawable-transform.c:644 ../app/tools/gimpfliptool.c:116
+#, fuzzy
+#| msgid "Flip"
+msgctxt "command"
+msgid "Flip"
+msgstr "�ลั���า�"
+
+#: ../app/core/gimpdrawable-transform.c:744 ../app/tools/gimprotatetool.c:121
 #, fuzzy
-msgid "command|Rotate"
+#| msgid "Rotate"
+msgctxt "command"
+msgid "Rotate"
 msgstr "หมุ�"
 
-#: ../app/core/gimpdrawable-transform.c:1325 ../app/core/gimplayer.c:252
+#: ../app/core/gimpdrawable-transform.c:883 ../app/core/gimplayer.c:264
 msgid "Transform Layer"
 msgstr "��ลี�ย�รู�ร�า��ั���า�"
 
-#: ../app/core/gimpdrawable-transform.c:1340
+#: ../app/core/gimpdrawable-transform.c:898
 msgid "Transformation"
 msgstr "�าร��ลี�ย�รู�ร�า�"
 
-#: ../app/core/gimpgradient-load.c:69
+#: ../app/core/gimpdynamicsoutput.c:106
+msgid "Output type"
+msgstr ""
+
+#: ../app/core/gimpgradient-load.c:71 ../app/core/gimpgradient-load.c:96
+#: ../app/core/gimpgradient-load.c:117 ../app/core/gimpgradient-load.c:168
+#, fuzzy, c-format
+msgid "Fatal parse error in gradient file '%s': Read error in line %d."
+msgstr "��อ�วาม��� UTF-8 �ม�มี��า����ล�หัว��ร� '%s'"
+
+#: ../app/core/gimpgradient-load.c:81
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file."
 msgstr ""
 
-#: ../app/core/gimpgradient-load.c:86
+#: ../app/core/gimpgradient-load.c:109
 #, c-format
 msgid "Invalid UTF-8 string in gradient file '%s'."
 msgstr "��อ�วาม��� UTF-8 �ม�มี��า����ล�สี�ร��า '%s'"
 
-#: ../app/core/gimpgradient-load.c:103
-#, c-format
-msgid "Fatal parse error in gradient file '%s': File is corrupt."
-msgstr ""
+#: ../app/core/gimpgradient-load.c:136
+#, fuzzy, c-format
+msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d."
+msgstr "��อ�วาม��� UTF-8 �ม�มี��า����ล�หัว��ร� '%s'"
 
-#: ../app/core/gimpgradient-load.c:175 ../app/core/gimpgradient-load.c:185
+#: ../app/core/gimpgradient-load.c:218 ../app/core/gimpgradient-load.c:229
 #, c-format
-msgid "Corrupt segment %d in gradient file '%s'."
+msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d."
 msgstr ""
 
-#: ../app/core/gimpgradient-load.c:196 ../app/core/gimpgradient-load.c:210
+#: ../app/core/gimpgradient-load.c:241 ../app/core/gimpgradient-load.c:255
 #, c-format
 msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1."
 msgstr ""
 
-#: ../app/core/gimpgradient-load.c:293
+#: ../app/core/gimpgradient-load.c:335
 #, c-format
 msgid "No linear gradients found in '%s'"
 msgstr "�ม���สี�ร��า�����ิ��ส���� '%s'"
 
-#: ../app/core/gimpgradient-load.c:303
+#: ../app/core/gimpgradient-load.c:345
 #, c-format
 msgid "Failed to import gradients from '%s': %s"
 msgstr "�าร�ำ���าสี�ร��า�า� '%s': %s ล�ม�หลว"
 
-#: ../app/core/gimpgrid.c:85
+#: ../app/core/gimpgrid.c:83
 msgid "Line style used for the grid."
 msgstr "ลั�ษ�ะ�ส���ี���������ส���ิ�ั�"
 
-#: ../app/core/gimpgrid.c:91
+#: ../app/core/gimpgrid.c:89
 msgid "The foreground color of the grid."
 msgstr "สี�ิ��ห��า�อ��ส���ิ�ั�"
 
-#: ../app/core/gimpgrid.c:96
+#: ../app/core/gimpgrid.c:94
 msgid ""
 "The background color of the grid; only used in double dashed line style."
 msgstr "สี�ื��หลั��อ��ส���ิ�ั� ���������าะ�ส���ิ�ั�����ึ��ู�"
 
-#: ../app/core/gimpgrid.c:102
+#: ../app/core/gimpgrid.c:100
 msgid "Horizontal spacing of grid lines."
 msgstr "ระยะห�า���ว�อ��อ��ส���ิ�ั�"
 
-#: ../app/core/gimpgrid.c:107
+#: ../app/core/gimpgrid.c:105
 msgid "Vertical spacing of grid lines."
 msgstr "ระยะห�า���ว�ั���อ��ส���ิ�ั�"
 
-#: ../app/core/gimpgrid.c:116
+#: ../app/core/gimpgrid.c:114
 msgid ""
 "Horizontal offset of the first grid line; this may be a negative number."
 msgstr "��า����ย�า���ว�อ��อ��ส���ิ�ั��ร� อา��ะ�����ำ�ว�ล�"
 
-#: ../app/core/gimpgrid.c:123
+#: ../app/core/gimpgrid.c:121
 msgid "Vertical offset of the first grid line; this may be a negative number."
 msgstr "��า����ย��ว�ั���อ��ส���ิ�ั��ร� อา��ะ�����ำ�ว�ล�"
 
-#: ../app/core/gimpimage-arrange.c:139
+#: ../app/core/gimpgrouplayer.c:178 ../app/core/gimpgrouplayer.c:837
+#, fuzzy
+#| msgid "Layer to _Top"
+msgid "Layer Group"
+msgstr "�ั���า���_��สุ�"
+
+#: ../app/core/gimpgrouplayer.c:179
+#, fuzzy
+#| msgid "Rename Layer"
+msgid "Rename Layer Group"
+msgstr "��ลี�ย��ื�อ�ั���า�"
+
+#: ../app/core/gimpgrouplayer.c:180
+#, fuzzy
+#| msgid "Move Layer"
+msgid "Move Layer Group"
+msgstr "��ลื�อ�ย�าย�ั���า�"
+
+#: ../app/core/gimpgrouplayer.c:181
+#, fuzzy
+#| msgid "Scale Layer"
+msgid "Scale Layer Group"
+msgstr "�รั�สั�ส�ว��ั���า�"
+
+#: ../app/core/gimpgrouplayer.c:182
+#, fuzzy
+#| msgid "Resize Layer"
+msgid "Resize Layer Group"
+msgstr "�รั���า��ั���า�"
+
+#: ../app/core/gimpgrouplayer.c:183
+#, fuzzy
+#| msgid "Flip Layer"
+msgid "Flip Layer Group"
+msgstr "�ลั���า��ั���า�"
+
+#: ../app/core/gimpgrouplayer.c:184
+#, fuzzy
+#| msgid "Rotate Layer"
+msgid "Rotate Layer Group"
+msgstr "หมุ��ั���า�"
+
+#: ../app/core/gimpgrouplayer.c:185
+#, fuzzy
+#| msgid "Transform Layer"
+msgid "Transform Layer Group"
+msgstr "��ลี�ย�รู�ร�า��ั���า�"
+
+#: ../app/core/gimpimage-arrange.c:142
 msgid "Arrange Objects"
 msgstr ""
 
-#: ../app/core/gimpimage-colormap.c:63
+#: ../app/core/gimpimage-colormap.c:67
 msgid "Set Colormap"
 msgstr "�ั����า�ั�สี"
 
-#: ../app/core/gimpimage-colormap.c:115
+#: ../app/core/gimpimage-colormap.c:132
 msgid "Change Colormap entry"
 msgstr "��ลี�ย�ลำ�ั��ั�สี"
 
-#: ../app/core/gimpimage-colormap.c:135
+#: ../app/core/gimpimage-colormap.c:157
 msgid "Add Color to Colormap"
 msgstr "��ิืมสี���า���ั�สี"
 
-#: ../app/core/gimpimage-convert.c:793
+#: ../app/core/gimpimage-convert.c:791
 #, fuzzy
 msgid "Cannot convert image: palette is empty."
 msgstr "�ม�สามาร��ั��รอ���� �ื���ี��ี��ลือ�ว�า���ล�า"
@@ -5827,316 +9386,323 @@ msgstr "��ล���าสีภา����� Grayscale"
 msgid "Convert Image to Indexed"
 msgstr "��ล���าสีภา����� Indexed"
 
-#: ../app/core/gimpimage-convert.c:897
+#: ../app/core/gimpimage-convert.c:894
 #, fuzzy
-msgid "Converting to indexed (stage 2)"
+msgid "Converting to indexed colors (stage 2)"
 msgstr "��ล���าสีภา����� Indexed"
 
-#: ../app/core/gimpimage-convert.c:942
+#: ../app/core/gimpimage-convert.c:939
 #, fuzzy
-msgid "Converting to indexed (stage 3)"
+msgid "Converting to indexed colors (stage 3)"
 msgstr "��ล���าสีภา����� Indexed"
 
-#: ../app/core/gimpimage-crop.c:125
+#: ../app/core/gimpimage-crop.c:129
 #, fuzzy
-msgid "command|Crop Image"
-msgstr "�ั��รอ��า�"
+#| msgid "_Crop Image"
+msgctxt "command"
+msgid "Crop Image"
+msgstr "_�ั��รอ�ภา�"
 
-#: ../app/core/gimpimage-crop.c:128 ../app/core/gimpimage-resize.c:88
+#: ../app/core/gimpimage-crop.c:132 ../app/core/gimpimage-resize.c:86
 msgid "Resize Image"
 msgstr "�รั���า�ภา�"
 
-#: ../app/core/gimpimage-guides.c:50
+#: ../app/core/gimpimage-grid.c:62 ../app/dialogs/grid-dialog.c:152
+msgid "Grid"
+msgstr "�ะ��ร�"
+
+#: ../app/core/gimpimage-guides.c:51
 msgid "Add Horizontal Guide"
 msgstr "��ิ�ม�ส���ำ��ว����ว�อ�"
 
-#: ../app/core/gimpimage-guides.c:72
+#: ../app/core/gimpimage-guides.c:74
 msgid "Add Vertical Guide"
 msgstr "��ิ�ม�ส���ำ��ว����ว�ั��"
 
-#: ../app/core/gimpimage-guides.c:113 ../app/tools/gimpmovetool.c:538
+#: ../app/core/gimpimage-guides.c:117 ../app/tools/gimpmovetool.c:563
 msgid "Remove Guide"
 msgstr "�อา�ส���ำ��วออ�"
 
-#: ../app/core/gimpimage-guides.c:138
+#: ../app/core/gimpimage-guides.c:142
 msgid "Move Guide"
 msgstr "��ลื�อ�ย�าย�ส���ำ��ว"
 
-#: ../app/core/gimpimage-item-list.c:53
+#: ../app/core/gimpimage-item-list.c:51
 #, fuzzy
 msgid "Translate Items"
 msgstr "ราย�าร�ู���ล"
 
-#: ../app/core/gimpimage-item-list.c:80
+#: ../app/core/gimpimage-item-list.c:78
 #, fuzzy
 msgid "Flip Items"
 msgstr "�ลั���า��ส���า�"
 
-#: ../app/core/gimpimage-item-list.c:107
+#: ../app/core/gimpimage-item-list.c:105
 #, fuzzy
 msgid "Rotate Items"
 msgstr "หมุ��ส���า�"
 
-#: ../app/core/gimpimage-item-list.c:138
+#: ../app/core/gimpimage-item-list.c:135
 #, fuzzy
 msgid "Transform Items"
 msgstr "��ล�ลั�ษ�ะ�ส���า�"
 
-#: ../app/core/gimpimage-merge.c:102 ../app/core/gimpimage-merge.c:114
+#: ../app/core/gimpimage-merge.c:108 ../app/core/gimpimage-merge.c:122
 msgid "Merge Visible Layers"
 msgstr "รวม�ั���า��ี�มอ��ห��"
 
-#: ../app/core/gimpimage-merge.c:165
+#: ../app/core/gimpimage-merge.c:176
 msgid "Flatten Image"
 msgstr "รวมภา�"
 
-#: ../app/core/gimpimage-merge.c:214
+#: ../app/core/gimpimage-merge.c:225
+msgid "Cannot merge down to a layer group."
+msgstr ""
+
+#: ../app/core/gimpimage-merge.c:232
+msgid "The layer to merge down to is locked."
+msgstr ""
+
+#: ../app/core/gimpimage-merge.c:244
+#, fuzzy
+msgid "There is no visible layer to merge down to."
+msgstr "�ม�มี�ั���า�หรือ�����ล�ี��ำลั��ำ�า�อยู��ห��ั�ออ�มา"
+
+#: ../app/core/gimpimage-merge.c:255
 msgid "Merge Down"
 msgstr "รวม�ั���า�ล�า�"
 
-#: ../app/core/gimpimage-merge.c:252
+#: ../app/core/gimpimage-merge.c:277
+#, fuzzy
+#| msgid "Merge Layers"
+msgid "Merge Layer Group"
+msgstr "รวม�ั���า�"
+
+#: ../app/core/gimpimage-merge.c:330
 msgid "Merge Visible Paths"
 msgstr "รวม�ส���า��ี�มอ��ห��"
 
-#: ../app/core/gimpimage-merge.c:288
+#: ../app/core/gimpimage-merge.c:366
 msgid "Not enough visible paths for a merge. There must be at least two."
 msgstr "มี�ส���า��ี�มอ��ห���ม��อ�ี��ะรวม ��อ�มีอย�า���อยสอ��ส���า�"
 
-#: ../app/core/gimpimage-quick-mask.c:67
+#: ../app/core/gimpimage-quick-mask.c:85
 msgid "Enable Quick Mask"
 msgstr "��ิ�����า�ห��า�า���ว�"
 
-#: ../app/core/gimpimage-quick-mask.c:117
+#: ../app/core/gimpimage-quick-mask.c:135
 msgid "Disable Quick Mask"
 msgstr "�ิ�����า�ห��า�า���ว�"
 
-#: ../app/core/gimpimage-sample-points.c:55
-msgid "Add Sample_Point"
+#: ../app/core/gimpimage-sample-points.c:53
+#, fuzzy
+#| msgid "Add Sample_Point"
+msgid "Add Sample Point"
 msgstr "��ิ�ม�ุ�_สุ�ม"
 
-#: ../app/core/gimpimage-sample-points.c:121 ../app/tools/gimpcolortool.c:420
+#: ../app/core/gimpimage-sample-points.c:101 ../app/tools/gimpcolortool.c:432
 #, fuzzy
 msgid "Remove Sample Point"
 msgstr "�อา�ส���า�ออ�"
 
-#: ../app/core/gimpimage-sample-points.c:158
+#: ../app/core/gimpimage-sample-points.c:138
 #, fuzzy
 msgid "Move Sample Point"
 msgstr "��ลื�อ�ย�าย�ี���ี��ลือ�"
 
-#: ../app/core/gimpimage-undo-push.c:3298
+#: ../app/core/gimpimage-undo-push.c:862
 #, c-format
 msgid "Can't undo %s"
 msgstr "�ม�สามาร�ย�อ��าร�ระ�ำ %s ���"
 
-#: ../app/core/gimpimage.c:1404
+#: ../app/core/gimpimage.c:1632
 msgid "Change Image Resolution"
 msgstr "��ลี�ย��วามละ�อีย��อ�ภา�"
 
-#: ../app/core/gimpimage.c:1444
+#: ../app/core/gimpimage.c:1684
 msgid "Change Image Unit"
 msgstr "��ลี�ย�ห��วย�อ�ภา�"
 
-#: ../app/core/gimpimage.c:2279
+#: ../app/core/gimpimage.c:2654
 msgid "Attach Parasite to Image"
 msgstr ""
 
-#: ../app/core/gimpimage.c:2314
+#: ../app/core/gimpimage.c:2695
 msgid "Remove Parasite from Image"
 msgstr ""
 
-#: ../app/core/gimpimage.c:2766
+#: ../app/core/gimpimage.c:3283
 msgid "Add Layer"
 msgstr "��ิ�ม�ั���า�"
 
-#: ../app/core/gimpimage.c:2830 ../app/core/gimpimage.c:2843
+#: ../app/core/gimpimage.c:3333 ../app/core/gimpimage.c:3353
 msgid "Remove Layer"
 msgstr "�อา�ั���า�ออ�"
 
-#: ../app/core/gimpimage.c:2917
+#: ../app/core/gimpimage.c:3346
+msgid "Remove Floating Selection"
+msgstr "�อา�ื���ี��ลือ�ลอย�ัวออ�"
+
+#: ../app/core/gimpimage.c:3503
 msgid "Layer cannot be raised higher."
 msgstr "�ม�สามาร�สลั��ั���า��ึ�����อี�"
 
-#: ../app/core/gimpimage.c:2922
+#: ../app/core/gimpimage.c:3509
 msgid "Raise Layer"
 msgstr "สลั��ั���า��ึ��"
 
-#: ../app/core/gimpimage.c:2939
+#: ../app/core/gimpimage.c:3521
+msgid "Raise Layer to Top"
+msgstr "สลั��ั���า��ว���สุ�"
+
+#: ../app/core/gimpimage.c:3543
 msgid "Layer cannot be lowered more."
 msgstr "�ม�สามาร�สลั��ั���า�ล����อี�"
 
-#: ../app/core/gimpimage.c:2944
+#: ../app/core/gimpimage.c:3549
 msgid "Lower Layer"
 msgstr "สลั��ั���า�ล�"
 
-#: ../app/core/gimpimage.c:2955
-msgid "Raise Layer to Top"
-msgstr "สลั��ั���า��ว���สุ�"
-
-#: ../app/core/gimpimage.c:2970
+#: ../app/core/gimpimage.c:3568
 msgid "Lower Layer to Bottom"
 msgstr "สลั��ั���า�ล�ล�า�สุ�"
 
-#: ../app/core/gimpimage.c:3043
+#: ../app/core/gimpimage.c:3615
 msgid "Add Channel"
 msgstr "��ิ�ม�����ล"
 
-#: ../app/core/gimpimage.c:3087 ../app/core/gimpimage.c:3098
+#: ../app/core/gimpimage.c:3653 ../app/core/gimpimage.c:3665
 msgid "Remove Channel"
 msgstr "�อา�����ลออ�"
 
-#: ../app/core/gimpimage.c:3145
+#: ../app/core/gimpimage.c:3703
 msgid "Channel cannot be raised higher."
 msgstr "�ม�สามาร�สลั������ล�ึ�����อี�า�ี�"
 
-#: ../app/core/gimpimage.c:3150
+#: ../app/core/gimpimage.c:3709
 msgid "Raise Channel"
 msgstr "สลั������ล�ี��"
 
-#: ../app/core/gimpimage.c:3167
-msgid "Channel is already on top."
-msgstr "�����ลอยู���สุ��ล�ว"
-
-#: ../app/core/gimpimage.c:3172
+#: ../app/core/gimpimage.c:3721
 msgid "Raise Channel to Top"
 msgstr "สลั������ล�ว���สุ�"
 
-#: ../app/core/gimpimage.c:3189
+#: ../app/core/gimpimage.c:3744
 msgid "Channel cannot be lowered more."
 msgstr "�ม�สามาร�สลั������ลล����อี�"
 
-#: ../app/core/gimpimage.c:3194
+#: ../app/core/gimpimage.c:3750
 msgid "Lower Channel"
 msgstr "สลั������ลล�"
 
-#: ../app/core/gimpimage.c:3214
-msgid "Channel is already on the bottom."
-msgstr "�����ลออยู�ล�า�สุ��ล�ว"
-
-#: ../app/core/gimpimage.c:3219
+#: ../app/core/gimpimage.c:3769
 msgid "Lower Channel to Bottom"
 msgstr "สลั������ลล�ล�า�สุ�"
 
-#: ../app/core/gimpimage.c:3294
+#: ../app/core/gimpimage.c:3816
 msgid "Add Path"
 msgstr "��ิ�ม�ส���า�"
 
-#: ../app/core/gimpimage.c:3339
+#: ../app/core/gimpimage.c:3847
 msgid "Remove Path"
 msgstr "�อา�ส���า�ออ�"
 
-#: ../app/core/gimpimage.c:3383
+#: ../app/core/gimpimage.c:3877
 msgid "Path cannot be raised higher."
 msgstr "�ม�สามาร�สลั��ส���า��ึ�����อี�"
 
-#: ../app/core/gimpimage.c:3388
+#: ../app/core/gimpimage.c:3883
 msgid "Raise Path"
 msgstr "สลั��ส���า��ี��"
 
-#: ../app/core/gimpimage.c:3405
-msgid "Path is already on top."
-msgstr "�ส���า�อยู���สุ��ล�ว"
-
-#: ../app/core/gimpimage.c:3410
+#: ../app/core/gimpimage.c:3895
 msgid "Raise Path to Top"
 msgstr "สลั��ส���า��ึ����สุ�"
 
-#: ../app/core/gimpimage.c:3427
+#: ../app/core/gimpimage.c:3917
 msgid "Path cannot be lowered more."
 msgstr "�ม�สามาร�สลั��ส���า�ล����อี�"
 
-#: ../app/core/gimpimage.c:3432
+#: ../app/core/gimpimage.c:3923
 msgid "Lower Path"
 msgstr "สลั��ส���า�ล�"
 
-#: ../app/core/gimpimage.c:3452
-msgid "Path is already on the bottom."
-msgstr "�ส���า�อยู���สุ��ล�ว"
-
-#: ../app/core/gimpimage.c:3457
+#: ../app/core/gimpimage.c:3942
 msgid "Lower Path to Bottom"
 msgstr "สลั��ส���า�ล�ล�า�สุ�"
 
-#: ../app/core/gimpimagefile.c:548 ../app/dialogs/preferences-dialog.c:1641
+#: ../app/core/gimpimagefile.c:534 ../app/dialogs/preferences-dialog.c:1711
 msgid "Folder"
 msgstr "��ล��อร�"
 
-#: ../app/core/gimpimagefile.c:553
+#: ../app/core/gimpimagefile.c:539
 msgid "Special File"
 msgstr "��ล��ิ�ศษ"
 
-#: ../app/core/gimpimagefile.c:569
+#: ../app/core/gimpimagefile.c:555
 #, fuzzy
 msgid "Remote File"
 msgstr "�อา�ส���ำ��วออ�"
 
-#: ../app/core/gimpimagefile.c:586
+#: ../app/core/gimpimagefile.c:574
 msgid "Click to create preview"
 msgstr "����ื�อสร�า��าร�ส���ัวอย�า�"
 
-#: ../app/core/gimpimagefile.c:590
+#: ../app/core/gimpimagefile.c:580
 #, fuzzy
 msgid "Loading preview..."
 msgstr "�ำลั�สร�า��ัวอย�า��าร�ส�� ..."
 
-#: ../app/core/gimpimagefile.c:594
+#: ../app/core/gimpimagefile.c:586
 msgid "Preview is out of date"
 msgstr "�ัวอย�า��าร�ส���ม��ั�สมัย"
 
-#: ../app/core/gimpimagefile.c:598
+#: ../app/core/gimpimagefile.c:592
 msgid "Cannot create preview"
 msgstr "�ม�สามาร�สร�า��ัวอย�า��าร�ส�����"
 
-#: ../app/core/gimpimagefile.c:605
+#: ../app/core/gimpimagefile.c:602
 msgid "(Preview may be out of date)"
 msgstr "(�ัวอย�า��าร�ส��อา��ม��ั�สมัย)"
 
 #. pixel size
-#: ../app/core/gimpimagefile.c:612 ../app/widgets/gimpimagepropview.c:427
-#: ../app/widgets/gimpsizebox.c:437 ../app/widgets/gimptemplateeditor.c:564
+#: ../app/core/gimpimagefile.c:611 ../app/widgets/gimpimagepropview.c:446
+#: ../app/widgets/gimpsizebox.c:437 ../app/widgets/gimptemplateeditor.c:565
 #, fuzzy, c-format
 msgid "%d Ã? %d pixel"
 msgid_plural "%d Ã? %d pixels"
 msgstr[0] "%d x %d �ุ�ภา�"
 msgstr[1] "%d x %d �ุ�ภา�"
 
-#: ../app/core/gimpimagefile.c:629 ../app/display/gimpdisplayshell-title.c:318
+#: ../app/core/gimpimagefile.c:634 ../app/display/gimpdisplayshell-title.c:335
 #, fuzzy, c-format
 msgid "%d layer"
 msgid_plural "%d layers"
 msgstr[0] "%d �ั���า�"
 msgstr[1] "%d �ั���า�"
 
-#: ../app/core/gimpimagefile.c:675
+#: ../app/core/gimpimagefile.c:681
 #, c-format
 msgid "Could not open thumbnail '%s': %s"
 msgstr "�ม�สามาร���ิ�รู�ย�อ '%s': %s ���"
 
-#: ../app/core/gimpitem.c:1166
+#: ../app/core/gimpitem.c:1542
 msgid "Attach Parasite"
 msgstr ""
 
-#: ../app/core/gimpitem.c:1176
+#: ../app/core/gimpitem.c:1552
 msgid "Attach Parasite to Item"
 msgstr ""
 
-#: ../app/core/gimpitem.c:1219 ../app/core/gimpitem.c:1226
+#: ../app/core/gimpitem.c:1594 ../app/core/gimpitem.c:1601
 msgid "Remove Parasite from Item"
 msgstr ""
 
-#: ../app/core/gimplayer-floating-sel.c:98
-msgid "Remove Floating Selection"
-msgstr "�อา�ื���ี��ลือ�ลอย�ัวออ�"
-
-#: ../app/core/gimplayer-floating-sel.c:129
-msgid "Cannot anchor this layer because it is not a floating selection."
-msgstr "�ม�สามาร��ั��ัว�ั��ั���า��ี���� ��ื�อ��า��ม���������ื���ี��ลือ�ลอย�ัว"
-
-#: ../app/core/gimplayer-floating-sel.c:136
+#: ../app/core/gimplayer-floating-sel.c:95
 msgid "Anchor Floating Selection"
 msgstr "�ั��ัว�ื���ี��ลือ�ลอย�ัว"
 
-#: ../app/core/gimplayer-floating-sel.c:209
+#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:579
 msgid ""
 "Cannot create a new layer from the floating selection because it belongs to "
 "a layer mask or channel."
@@ -6144,42 +9710,38 @@ msgstr ""
 "�ม�สามาร�สร�า��ื���ี��ลือ�ลอย�ัว�����ั���า��หม���� "
 "��ื�อ��า�อา�����ส�ว�ห�ึ���อ��ั���า�ห��า�า�หรือ�����ล"
 
-#: ../app/core/gimplayer-floating-sel.c:215
+#: ../app/core/gimplayer-floating-sel.c:133
 msgid "Floating Selection to Layer"
 msgstr "��ล��ื���ี��ลือ�ลอย�ัว�����ั���า�"
 
-#: ../app/core/gimplayer.c:245
-msgid "Layer"
-msgstr "�ั���า�"
-
-#: ../app/core/gimplayer.c:246
+#: ../app/core/gimplayer.c:258
 msgid "Rename Layer"
 msgstr "��ลี�ย��ื�อ�ั���า�"
 
-#: ../app/core/gimplayer.c:247 ../app/pdb/layer_cmds.c:290
-#: ../app/pdb/layer_cmds.c:324
+#: ../app/core/gimplayer.c:259 ../app/pdb/layer-cmds.c:443
+#: ../app/pdb/layer-cmds.c:481
 msgid "Move Layer"
 msgstr "��ลื�อ�ย�าย�ั���า�"
 
-#: ../app/core/gimplayer.c:249
+#: ../app/core/gimplayer.c:261
 msgid "Resize Layer"
 msgstr "�รั���า��ั���า�"
 
-#: ../app/core/gimplayer.c:250
+#: ../app/core/gimplayer.c:262
 msgid "Flip Layer"
 msgstr "�ลั���า��ั���า�"
 
-#: ../app/core/gimplayer.c:251
+#: ../app/core/gimplayer.c:263
 msgid "Rotate Layer"
 msgstr "หมุ��ั���า�"
 
-#: ../app/core/gimplayer.c:401 ../app/core/gimplayer.c:1302
-#: ../app/core/gimplayermask.c:204
+#: ../app/core/gimplayer.c:421 ../app/core/gimplayer.c:1458
+#: ../app/core/gimplayermask.c:234
 #, c-format
 msgid "%s mask"
 msgstr "%s ห��า�า�"
 
-#: ../app/core/gimplayer.c:445
+#: ../app/core/gimplayer.c:460
 #, c-format
 msgid ""
 "Floating Selection\n"
@@ -6188,456 +9750,590 @@ msgstr ""
 "�ื���ี��ลือ�ลอย�ัว\n"
 "(%s)"
 
-#: ../app/core/gimplayer.c:1225
-msgid "Cannot add layer mask to layer which is not part of an image."
-msgstr "�ม�สามาร���ิ�มห��า�า����า���ั���า���� �ึ���ม����ส�ว�ห�ึ���อ�ภา�"
-
-#: ../app/core/gimplayer.c:1232
+#: ../app/core/gimplayer.c:1382
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr "�ม�สามาร���ิ�ม�ั���า�ห��า�า���� ��ื�อ��า����มีอยู��ล�ว"
 
-#: ../app/core/gimplayer.c:1239
-msgid "Cannot add layer mask to a layer with no alpha channel."
-msgstr "�ม�สามาร���ิ�ม�ั���า�ห��า�า�ล����ั���า������ย�ม�มี�����ลอัล�า"
-
-#: ../app/core/gimplayer.c:1249
+#: ../app/core/gimplayer.c:1393
 msgid "Cannot add layer mask of different dimensions than specified layer."
 msgstr "�ม�สามาร���ิ�มห��า�า��ี�มิ�ิ��า��า��ั���า��ี�ระ�ุ���"
 
-#: ../app/core/gimplayer.c:1356
+#: ../app/core/gimplayer.c:1513
 msgid "Transfer Alpha to Mask"
 msgstr "��ล������ลอัล�า����ห��า�า�"
 
-#: ../app/core/gimplayer.c:1521 ../app/core/gimplayermask.c:231
+#: ../app/core/gimplayer.c:1683 ../app/core/gimplayermask.c:260
 msgid "Apply Layer Mask"
 msgstr "�ระยุ�������ั���า�ห��า�า�"
 
-#: ../app/core/gimplayer.c:1522
+#: ../app/core/gimplayer.c:1684
 msgid "Delete Layer Mask"
 msgstr "ล��ั���า�ห��า�า�"
 
-#: ../app/core/gimplayer.c:1623
+#: ../app/core/gimplayer.c:1803
 msgid "Add Alpha Channel"
 msgstr "��ิ�ม�����ลอัล�า"
 
-#: ../app/core/gimplayer.c:1674
+#: ../app/core/gimplayer.c:1857
 #, fuzzy
 msgid "Remove Alpha Channel"
 msgstr "�อา�����ลออ�"
 
-#: ../app/core/gimplayer.c:1696
+#: ../app/core/gimplayer.c:1877
 msgid "Layer to Image Size"
 msgstr "�ั���า����า��า�ภา�"
 
-#: ../app/core/gimplayermask.c:102
+#: ../app/core/gimplayermask.c:110
 msgid "Move Layer Mask"
 msgstr "��ลื�อ�ย�าย�ั���า�ห��า�า�"
 
-#: ../app/core/gimplayermask.c:292
+#: ../app/core/gimplayermask.c:184
+#, fuzzy, c-format
+#| msgid "Cannot create folder '%s': %s"
+msgid "Cannot rename layer masks."
+msgstr "�ม�สามาร�สร�า���ล��อร� '%s': %s ���"
+
+#: ../app/core/gimplayermask.c:328
 msgid "Show Layer Mask"
 msgstr "�ส���ั��ห��า�า�"
 
-#: ../app/core/gimppalette-import.c:431
+#: ../app/core/gimppalette-import.c:438
 #, fuzzy, c-format
 msgid "Index %d"
 msgstr "Indexed"
 
-#: ../app/core/gimppalette-import.c:676
+#: ../app/core/gimppalette-import.c:547
 #, fuzzy, c-format
 msgid "Unknown type of palette file: %s"
 msgstr ""
 "�ม�รู��ั��ระ�ภ��อ���ล��า�สี:\n"
 "%s"
 
-#: ../app/core/gimppalette.c:339
+#: ../app/core/gimppalette-load.c:85 ../app/core/gimppalette-load.c:111
+#: ../app/core/gimppalette-load.c:132 ../app/core/gimppalette-load.c:161
+#: ../app/core/gimppalette-load.c:237
 #, c-format
-msgid ""
-"Fatal parse error in palette file '%s': Missing magic header.\n"
-"Does this file need converting from DOS?"
+msgid "Fatal parse error in palette file '%s': Read error in line %d."
 msgstr ""
 
-#: ../app/core/gimppalette.c:345
+#: ../app/core/gimppalette-load.c:95
 #, c-format
 msgid "Fatal parse error in palette file '%s': Missing magic header."
 msgstr ""
 
-#: ../app/core/gimppalette.c:361 ../app/core/gimppalette.c:384
-#: ../app/core/gimppalette.c:414 ../app/core/gimppalette.c:492
-#, c-format
-msgid "Fatal parse error in palette file '%s': Read error in line %d."
-msgstr ""
-
-#: ../app/core/gimppalette.c:376
+#: ../app/core/gimppalette-load.c:124
 #, c-format
 msgid "Invalid UTF-8 string in palette file '%s'"
 msgstr "��อ�วาม��� UTF-8 ����ม��������ล��า�สี '%s'"
 
-#: ../app/core/gimppalette.c:402
+#: ../app/core/gimppalette-load.c:148
 #, c-format
 msgid ""
 "Reading palette file '%s': Invalid number of columns in line %d. Using "
 "default value."
 msgstr "�ำลั�อ�า����ม�า�สี '%s'หมาย�ล��อลัม�����รร�ั� %d �ม��ู���อ� �ำห�������า�ริยาย"
 
-#. maybe we should just abort?
-#: ../app/core/gimppalette.c:440
+#: ../app/core/gimppalette-load.c:184
 #, c-format
 msgid "Reading palette file '%s': Missing RED component in line %d."
 msgstr "�ารอ�า���ล��า�สี '%s': ��าสี����ิ��ลา��ี��รร�ั� %d"
 
-#: ../app/core/gimppalette.c:448
-#, c-format
-msgid "Reading palette '%s': Missing GREEN component in line %d."
-msgstr "�ารอ�า���ล��า�สี '%s': ��าสี��ียว�ิ��ลา��ี��รร�ั� %d"
+#: ../app/core/gimppalette-load.c:192
+#, fuzzy, c-format
+#| msgid "Reading palette file '%s': Missing RED component in line %d."
+msgid "Reading palette file '%s': Missing GREEN component in line %d."
+msgstr "�ารอ�า���ล��า�สี '%s': ��าสี����ิ��ลา��ี��รร�ั� %d"
 
-#: ../app/core/gimppalette.c:456
+#: ../app/core/gimppalette-load.c:200
 #, c-format
 msgid "Reading palette file '%s': Missing BLUE component in line %d."
 msgstr "�ารอ�า���ล��า�สี '%s': ��าสี��ำ��ิ��ิ��ลา��ี��รร�ั� %d"
 
-#: ../app/core/gimppalette.c:466
+#: ../app/core/gimppalette-load.c:210
 #, c-format
 msgid "Reading palette file '%s': RGB value out of range in line %d."
 msgstr "�ารอ�า���ล��า�สี '%s': ��า RGB �ม�อยู�����ว��ี��ส�����า��ี��รร�ั� %d."
 
-#: ../app/core/gimppattern.c:274 ../app/core/gimppattern.c:320
-#: ../app/core/gimppattern.c:351
+#: ../app/core/gimppalette-load.c:477
+#, fuzzy, c-format
+#| msgid "Could not read %d bytes from '%s': %s"
+msgid "Could not read header from palette file '%s'"
+msgstr "�ม�สามาร�อ�า���� %d ���� �า� '%s': %s"
+
+#: ../app/core/gimppalette-load.c:500 ../app/core/gimppalette-load.c:588
+#, fuzzy, c-format
+msgid "Fatal parse error in palette file '%s'"
+msgstr "��อ�วาม��� UTF-8 �ม�มี��า����ล�หัว��ร� '%s'"
+
+#: ../app/core/gimppattern-load.c:85 ../app/core/gimppattern-load.c:131
+#: ../app/core/gimppattern-load.c:162
 #, c-format
 msgid "Fatal parse error in pattern file '%s': File appears truncated."
 msgstr ""
 
-#: ../app/core/gimppattern.c:293
+#: ../app/core/gimppattern-load.c:104
 #, c-format
 msgid ""
 "Fatal parse error in pattern file '%s': Unknown pattern format version %d."
 msgstr ""
 
-#: ../app/core/gimppattern.c:303
+#: ../app/core/gimppattern-load.c:114
 #, c-format
 msgid ""
 "Fatal parse error in pattern file '%s: Unsupported pattern depth %d.\n"
 "GIMP Patterns must be GRAY or RGB."
 msgstr ""
 
-#: ../app/core/gimppattern.c:328
+#: ../app/core/gimppattern-load.c:139
 #, c-format
 msgid "Invalid UTF-8 string in pattern file '%s'."
 msgstr "��อ�วาม��� UTF-8 ����ม��������ล����ลาย '%s'"
 
-#: ../app/core/gimppdbprogress.c:286 ../app/widgets/gimppdbdialog.c:345
+#: ../app/core/gimppdbprogress.c:287 ../app/widgets/gimppdbdialog.c:351
 #, c-format
 msgid "Unable to run %s callback. The corresponding plug-in may have crashed."
 msgstr ""
 
-#: ../app/core/gimpprogress.c:107 ../app/core/gimpprogress.c:154
+#: ../app/core/gimpprogress.c:106 ../app/core/gimpprogress.c:153
 #, fuzzy
 msgid "Please wait"
 msgstr "�รู�ารอสั��รู�..."
 
-#: ../app/core/gimpselection.c:149 ../app/tools/gimpeditselectiontool.c:233
+#: ../app/core/gimpselection.c:154 ../app/tools/gimpeditselectiontool.c:241
 msgid "Move Selection"
 msgstr "��ลื�อ�ย�าย�ี���ี��ลือ�"
 
-#: ../app/core/gimpselection.c:167
+#: ../app/core/gimpselection.c:172
 msgid "Sharpen Selection"
 msgstr "�ำ�ื���ี�ลือ��ห��ั�"
 
-#: ../app/core/gimpselection.c:168
+#: ../app/core/gimpselection.c:173
 msgid "Select None"
 msgstr "�ม�มี�าร�ลือ�"
 
-#: ../app/core/gimpselection.c:169
+#: ../app/core/gimpselection.c:174
 msgid "Select All"
 msgstr "�ลือ��ั��หม�"
 
-#: ../app/core/gimpselection.c:170
+#: ../app/core/gimpselection.c:175
 msgid "Invert Selection"
 msgstr "�ลั�ส�ว��ื���ี��ลือ�"
 
-#: ../app/core/gimpselection.c:271
-msgid "No selection to stroke."
+#: ../app/core/gimpselection.c:285
+#, fuzzy
+#| msgid "No selection to stroke."
+msgid "There is no selection to stroke."
 msgstr "�ม�มี�าร�ลือ��ื���ี����าร�ี�ส��"
 
-#: ../app/core/gimpselection.c:780
+#: ../app/core/gimpselection.c:669
+msgid "Unable to cut or copy because the selected region is empty."
+msgstr "�ม�สามาร��ั�หรือ�ั�ลอ���� ��ราะว�า�ื���ี��ี��ลือ������ึ���ี�ว�า�"
+
+#: ../app/core/gimpselection.c:844
 msgid "Cannot float selection because the selected region is empty."
 msgstr "�ม�สามาร�ลอย�ัว�ื���ี��ลือ������ื�อ��า������ื���ี��ว�า�"
 
-#: ../app/core/gimpselection.c:787
+#: ../app/core/gimpselection.c:851
 msgid "Float Selection"
 msgstr "ลอย�ัว�ื���ี��ลือ�"
 
-#: ../app/core/gimpselection.c:804
+#: ../app/core/gimpselection.c:867
 msgid "Floated Layer"
 msgstr "�ั���า�ลอย�ัว"
 
-#: ../app/core/gimpstrokeoptions.c:119
+#: ../app/core/gimpstrokeoptions.c:151
 msgid ""
 "Convert a mitered join to a bevelled join if the miter would extend to a "
 "distance of more than miter-limit * line-width from the actual join point."
 msgstr ""
 
-#: ../app/core/gimptemplate.c:116
+#: ../app/core/gimptemplate.c:106
 #, fuzzy
 msgid "The unit used for coordinate display when not in dot-for-dot mode."
 msgstr "ระ��ห��วย ����ส����ห��า�อ�มื�อ�ม����อยู���ระ���ุ���อ�ุ�"
 
-#: ../app/core/gimptemplate.c:123
+#: ../app/core/gimptemplate.c:113
 msgid "The horizontal image resolution."
 msgstr "�วามละ�อีย��อ�ภา��า���ว�อ�"
 
-#: ../app/core/gimptemplate.c:128
+#: ../app/core/gimptemplate.c:119
 msgid "The vertical image resolution."
 msgstr "�วามละ�อีย��อ�ภา��า���ว�ั��"
 
-#: ../app/core/gimptemplate.c:411 ../app/widgets/widgets-enums.c:24
+#: ../app/core/gimptemplate.c:405
 msgid "Background"
 msgstr "�ื��หลั�"
 
-#. pseudo unit
-#: ../app/core/gimpunit.c:55
+#: ../app/core/gimpunit.c:56
+#, fuzzy
+#| msgid "pixel"
+msgctxt "unit-singular"
 msgid "pixel"
 msgstr "�ุ�ภา�"
 
-#: ../app/core/gimpunit.c:55 ../app/tools/gimpmeasuretool.c:805
-#: ../app/tools/gimpmeasuretool.c:946 ../app/tools/gimpmeasuretool.c:998
-#: ../app/tools/gimpmeasuretool.c:1024 ../app/tools/gimppainttool.c:600
+#: ../app/core/gimpunit.c:56
+#, fuzzy
+#| msgid "pixels"
+msgctxt "unit-plural"
 msgid "pixels"
 msgstr "�ุ�ภา�"
 
-#. standard units
-#: ../app/core/gimpunit.c:58
+#: ../app/core/gimpunit.c:60
+#, fuzzy
+#| msgid "inch"
+msgctxt "unit-singular"
 msgid "inch"
 msgstr "�ิ�ว"
 
-#: ../app/core/gimpunit.c:58
+#: ../app/core/gimpunit.c:60
+#, fuzzy
+#| msgid "inches"
+msgctxt "unit-plural"
 msgid "inches"
 msgstr "�ิ�ว"
 
-#: ../app/core/gimpunit.c:59
+#: ../app/core/gimpunit.c:63
+#, fuzzy
+#| msgid "millimeter"
+msgctxt "unit-singular"
 msgid "millimeter"
 msgstr "มิลลิ�ม�ร"
 
-#: ../app/core/gimpunit.c:59
+#: ../app/core/gimpunit.c:63
+#, fuzzy
+#| msgid "millimeters"
+msgctxt "unit-plural"
 msgid "millimeters"
 msgstr "มิลลิ�ม�ร"
 
-#. professional units
-#: ../app/core/gimpunit.c:62
+#: ../app/core/gimpunit.c:67
+#, fuzzy
+#| msgid "point"
+msgctxt "unit-singular"
 msgid "point"
 msgstr "�ุ�"
 
-#: ../app/core/gimpunit.c:62
+#: ../app/core/gimpunit.c:67
+#, fuzzy
+#| msgid "points"
+msgctxt "unit-plural"
 msgid "points"
 msgstr "�ุ�"
 
-#: ../app/core/gimpunit.c:63
+#: ../app/core/gimpunit.c:70
+#, fuzzy
+#| msgid "Replicate"
+msgctxt "unit-singular"
 msgid "pica"
-msgstr ""
+msgstr "�ำ��ำ"
 
-#: ../app/core/gimpunit.c:63
+#: ../app/core/gimpunit.c:70
+msgctxt "unit-plural"
 msgid "picas"
 msgstr ""
 
-#: ../app/core/gimpunit.c:70
+#: ../app/core/gimpunit.c:78
+#, fuzzy
+#| msgid "percent"
+msgctxt "singular"
 msgid "percent"
 msgstr "��อร�������"
 
-#: ../app/core/gimpunit.c:70
+#: ../app/core/gimpunit.c:78
 #, fuzzy
-msgid "plural|percent"
+#| msgid "percent"
+msgctxt "plural"
+msgid "percent"
 msgstr "��อร�������"
 
-#: ../app/dialogs/about-dialog.c:121
+#: ../app/dialogs/about-dialog.c:102 ../app/gui/gui.c:484
+#, fuzzy
+msgid "About GIMP"
+msgstr "ออ��า� GIMP"
+
+#: ../app/dialogs/about-dialog.c:111
 msgid "Visit the GIMP website"
 msgstr "�ยี�ยม�ม�ว������ Gimp"
 
-#. Translators: insert your names here,
-#. * separated by newline
-#.
-#: ../app/dialogs/about-dialog.c:128
+#. Translators: insert your names here, separated by newline
+#: ../app/dialogs/about-dialog.c:116
 msgid "translator-credits"
 msgstr "ราย�าร�ู���ล"
 
-#: ../app/dialogs/about-dialog.c:527
+#: ../app/dialogs/about-dialog.c:509
 msgid "GIMP is brought to you by"
 msgstr "�ำ Gimp มาสู��ุ���ย"
 
-#: ../app/dialogs/about-dialog.c:601
+#: ../app/dialogs/about-dialog.c:583
 msgid "This is an unstable development release."
 msgstr ""
 
-#: ../app/dialogs/channel-options-dialog.c:144
+#: ../app/dialogs/channel-options-dialog.c:146
 #, fuzzy
 msgid "Channel _name:"
 msgstr "�ื�อ�����ล"
 
-#: ../app/dialogs/channel-options-dialog.c:173
+#: ../app/dialogs/channel-options-dialog.c:175
 #, fuzzy
 msgid "Initialize from _selection"
 msgstr "�ลั��าร�ลือ�"
 
-#: ../app/dialogs/convert-dialog.c:122
+#: ../app/dialogs/convert-dialog.c:125
 msgid "Indexed Color Conversion"
 msgstr "�าร��ล�สี Indexed"
 
-#: ../app/dialogs/convert-dialog.c:125
+#: ../app/dialogs/convert-dialog.c:128
 msgid "Convert Image to Indexed Colors"
 msgstr "��ล���าสีภา�������� Indexed"
 
-#: ../app/dialogs/convert-dialog.c:135
+#: ../app/dialogs/convert-dialog.c:138
 #, fuzzy
 msgid "C_onvert"
 msgstr "_�ลั�"
 
-#: ../app/dialogs/convert-dialog.c:186
+#: ../app/dialogs/convert-dialog.c:190
 msgid "_Maximum number of colors:"
 msgstr "_�ำ�ว�สีสู�สุ�:"
 
-#: ../app/dialogs/convert-dialog.c:213
+#: ../app/dialogs/convert-dialog.c:217
 #, fuzzy
 msgid "_Remove unused colors from colormap"
 msgstr "_ล�สี�ี��ม����ออ��า��า�สีล�าสุ�"
 
 #. dithering
-#: ../app/dialogs/convert-dialog.c:229 ../app/tools/gimpblendoptions.c:236
+#: ../app/dialogs/convert-dialog.c:233 ../app/tools/gimpblendoptions.c:246
 msgid "Dithering"
 msgstr "�าร�ละสี"
 
-#: ../app/dialogs/convert-dialog.c:241
+#: ../app/dialogs/convert-dialog.c:245
 msgid "Color _dithering:"
 msgstr "�_���าร�ละสี:"
 
-#: ../app/dialogs/convert-dialog.c:256
+#: ../app/dialogs/convert-dialog.c:260
 msgid "Enable dithering of _transparency"
 msgstr "สามาร�_�ละสี���ื���ี���ร���ส"
 
-#: ../app/dialogs/convert-dialog.c:282
+#: ../app/dialogs/convert-dialog.c:287
 #, fuzzy
 msgid "Converting to indexed colors"
 msgstr "��ล���าสีภา����� Indexed"
 
-#: ../app/dialogs/convert-dialog.c:398
+#: ../app/dialogs/convert-dialog.c:414 ../app/pdb/convert-cmds.c:152
 #, fuzzy
 msgid "Cannot convert to a palette with more than 256 colors."
 msgstr "�ม�สามาร���ล��ลั������า�สี�ี�มีมา��ว�า 256 สี���"
 
-#: ../app/dialogs/desaturate-dialog.c:64
-#, fuzzy
-msgid "Remove Colors"
-msgstr "�อา�����ลออ�"
-
-#: ../app/dialogs/desaturate-dialog.c:74
-msgid "_Desaturate"
-msgstr "_�ึ�สีออ�"
-
-#: ../app/dialogs/desaturate-dialog.c:96
-msgid "Choose shade of gray based on:"
-msgstr "�ลือ�ระ�ั�สี��า�าม�า��อ�:"
-
-#: ../app/dialogs/dialogs-constructors.c:184 ../app/gui/gui.c:155
-#: ../app/gui/gui-message.c:123
+#: ../app/dialogs/dialogs-constructors.c:212 ../app/gui/gui.c:164
+#: ../app/gui/gui-message.c:145
 msgid "GIMP Message"
 msgstr "��อ�วาม GIMP"
 
-#: ../app/dialogs/dialogs.c:133
+#: ../app/dialogs/dialogs.c:267
 msgid "Devices"
 msgstr "อุ��ร����า��"
 
-#: ../app/dialogs/dialogs.c:137
+#: ../app/dialogs/dialogs.c:267
+msgid "Device Status"
+msgstr "ส�า�ะอุ��ร��"
+
+#: ../app/dialogs/dialogs.c:271
 msgid "Errors"
 msgstr "��อ�ิ��ลา�"
 
-#: ../app/dialogs/dialogs.c:162
+#: ../app/dialogs/dialogs.c:275
+msgid "Pointer"
+msgstr "�ัว�ี�"
+
+#: ../app/dialogs/dialogs.c:294
 msgid "History"
 msgstr "�ระวั�ิ�า�"
 
-#: ../app/dialogs/dialogs.c:193
+#: ../app/dialogs/dialogs.c:296
+msgid "Image Templates"
+msgstr "�ม������า�� �อ�ภา�"
+
+#: ../app/dialogs/dialogs.c:323
+msgid "Histogram"
+msgstr "�รา�ส�ิ�ิ�วาม�ี�"
+
+#: ../app/dialogs/dialogs.c:327
+msgid "Selection"
+msgstr "�ื���ี��าร�ลือ�"
+
+#: ../app/dialogs/dialogs.c:327
+msgid "Selection Editor"
+msgstr "��รื�อ�มือ������ื���ี��ลือ�"
+
+#: ../app/dialogs/dialogs.c:331
 msgid "Undo"
-msgstr "�ลั��ื�"
+msgstr "�รีย��ื�"
+
+#: ../app/dialogs/dialogs.c:331
+msgid "Undo History"
+msgstr "�ระวั�ิ�าร�รีย��ื�"
 
-#: ../app/dialogs/dialogs.c:203
+#: ../app/dialogs/dialogs.c:341
 msgid "Navigation"
 msgstr "�ัว�ำ�า�"
 
-#: ../app/dialogs/dialogs.c:209
+#: ../app/dialogs/dialogs.c:341
+msgid "Display Navigation"
+msgstr "�าร�ำ�า�ห��า��า��ส���ล"
+
+#: ../app/dialogs/dialogs.c:347
 msgid "FG/BG"
 msgstr "สี�ื��ห��า/�ื��หลั�"
 
-#: ../app/dialogs/file-open-location-dialog.c:75
+#: ../app/dialogs/dialogs.c:347
+msgid "FG/BG Color"
+msgstr "สี�ื��ห��า/�ื��หลั�"
+
+#: ../app/dialogs/fade-dialog.c:110
+#, fuzzy, c-format
+#| msgid "Fade out"
+msgid "Fade %s"
+msgstr "�า�ล�"
+
+#: ../app/dialogs/fade-dialog.c:122
+#, fuzzy
+#| msgid "Fade out"
+msgid "_Fade"
+msgstr "�า�ล�"
+
+#: ../app/dialogs/fade-dialog.c:157 ../app/widgets/gimpdeviceinfoeditor.c:346
+#, fuzzy
+#| msgid "_Mode"
+msgid "_Mode:"
+msgstr "_ระ��สีภา�"
+
+#: ../app/dialogs/fade-dialog.c:163
+#, fuzzy
+#| msgid "_Opacity"
+msgid "_Opacity:"
+msgstr "�วาม_�ึ��ส�"
+
+#: ../app/dialogs/file-open-dialog.c:255
+#, fuzzy
+#| msgid "New layer"
+msgid "Open layers"
+msgstr "�ั���า��หม�"
+
+#: ../app/dialogs/file-open-location-dialog.c:71
 msgid "Open Location"
 msgstr "��ิ��า��ำ�ห���"
 
-#: ../app/dialogs/file-open-location-dialog.c:113
+#: ../app/dialogs/file-open-location-dialog.c:109
 msgid "Enter location (URI):"
 msgstr "��อ��ำ�ห����ี�อยู� (URI): "
 
-#: ../app/dialogs/file-save-dialog.c:286 ../app/dialogs/file-save-dialog.c:329
+#: ../app/dialogs/file-save-dialog.c:105
 #, fuzzy
-msgid ""
-"The given filename does not have any known file extension. Please enter a "
-"known file extension or select a file format from the file format list."
-msgstr ""
-"�ื�อ���ม�ี��ำห���ม�มี�ามส�ุล�ี�รู��ั� �รุ�า�ส��ามส�ุล�ี�รู��ั�หรือ�ลือ�รู�����ามส�ุล���ม�า�ราย�ารรู����"
+#| msgid "Revert Image"
+msgid "Export Image"
+msgstr "ย�อ��ลั�����ภา��ั����ิม"
+
+#: ../app/dialogs/file-save-dialog.c:106
+#, fuzzy
+#| msgid "_Import"
+msgid "_Export"
+msgstr "�ำ�_��า"
 
-#: ../app/dialogs/file-save-dialog.c:371
+#: ../app/dialogs/file-save-dialog.c:468
 msgid ""
 "Saving remote files needs to determine the file format from the file "
 "extension. Please enter a file extension that matches the selected file "
 "format or enter no file extension at all."
 msgstr ""
 
-#: ../app/dialogs/file-save-dialog.c:431
+#: ../app/dialogs/file-save-dialog.c:595
+msgid ""
+"You can use this dialog to export to various file formats. If you want to "
+"save the image to the GIMP XCF format, use Fileâ??Save instead."
+msgstr ""
+
+#: ../app/dialogs/file-save-dialog.c:602
+msgid ""
+"You can use this dialog to save to the GIMP XCF format. Use Fileâ??Export to "
+"export to other file formats."
+msgstr ""
+
+#: ../app/dialogs/file-save-dialog.c:608
+#, fuzzy
+msgid ""
+"The given filename does not have any known file extension. Please enter a "
+"known file extension or select a file format from the file format list."
+msgstr ""
+"�ื�อ���ม�ี��ำห���ม�มี�ามส�ุล�ี�รู��ั� �รุ�า�ส��ามส�ุล�ี�รู��ั�หรือ�ลือ�รู�����ามส�ุล���ม�า�ราย�ารรู����"
+
+#: ../app/dialogs/file-save-dialog.c:622
 #, fuzzy
 msgid "Extension Mismatch"
 msgstr "ส�ว��ยาย"
 
-#: ../app/dialogs/file-save-dialog.c:447
+#: ../app/dialogs/file-save-dialog.c:638
 msgid "The given file extension does not match the chosen file type."
 msgstr "�ามส�ุล���ม�ี��ำห���ม��ร��ั���ิ����ม�ี��ลือ�"
 
-#: ../app/dialogs/file-save-dialog.c:451
+#: ../app/dialogs/file-save-dialog.c:642
 #, fuzzy
 msgid "Do you want to save the image using this name anyway?"
 msgstr "��า���อ��าร����ี���วยภา��ี��ำลั��ั��ึ�หรือ�ม�?"
 
-#: ../app/dialogs/grid-dialog.c:82
+#: ../app/dialogs/file-save-dialog.c:697
+#, fuzzy
+#| msgid "Saving Images"
+msgid "Saving canceled"
+msgstr "�ำลั��ั��ึ�ภา���า��"
+
+#: ../app/dialogs/file-save-dialog.c:705 ../app/widgets/gimpdnd-xds.c:185
+#, c-format
+msgid ""
+"Saving '%s' failed:\n"
+"\n"
+"%s"
+msgstr ""
+"�าร�ั��ึ� '%s' ล�ม�หลว:\n"
+"\n"
+"%s"
+
+#: ../app/dialogs/grid-dialog.c:85
 msgid "Configure Grid"
 msgstr "�รั�������า�ส���ิ�ั�"
 
-#: ../app/dialogs/grid-dialog.c:83
+#: ../app/dialogs/grid-dialog.c:86
 msgid "Configure Image Grid"
 msgstr "�รั������ส���ิ�ั���ภา�"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:63
+#: ../app/dialogs/image-merge-layers-dialog.c:64
 msgid "Merge Layers"
 msgstr "รวม�ั���า�"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:65
+#: ../app/dialogs/image-merge-layers-dialog.c:66
 msgid "Layers Merge Options"
 msgstr "�ัว�ลือ��ารรวม�ั���า�"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:71
+#: ../app/dialogs/image-merge-layers-dialog.c:72
 #, fuzzy
 msgid "_Merge"
 msgstr "_วั���า"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:90
+#: ../app/dialogs/image-merge-layers-dialog.c:92
 msgid "Final, Merged Layer should be:"
 msgstr "สุ���าย �ั���า��ี�รวม�วร����:"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:94
+#: ../app/dialogs/image-merge-layers-dialog.c:96
 msgid "Expanded as necessary"
 msgstr "�ยาย���า�ี��ำ����"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:97
+#: ../app/dialogs/image-merge-layers-dialog.c:99
 msgid "Clipped to image"
 msgstr ""
 
-#: ../app/dialogs/image-merge-layers-dialog.c:100
+#: ../app/dialogs/image-merge-layers-dialog.c:102
 msgid "Clipped to bottom layer"
 msgstr ""
 
-#: ../app/dialogs/image-merge-layers-dialog.c:108
+#: ../app/dialogs/image-merge-layers-dialog.c:110
 #, fuzzy
 msgid "_Discard invisible layers"
 msgstr "รวม�ั���า��ี�มอ��ห��"
@@ -6647,21 +10343,21 @@ msgid "Create a New Image"
 msgstr "สร�า�ภา��หม�"
 
 #: ../app/dialogs/image-new-dialog.c:144
-#: ../app/dialogs/preferences-dialog.c:1892
+#: ../app/dialogs/preferences-dialog.c:2008
 msgid "_Template:"
 msgstr "_��า��ม����:"
 
-#: ../app/dialogs/image-new-dialog.c:291
+#: ../app/dialogs/image-new-dialog.c:299
 msgid "Confirm Image Size"
 msgstr "ยื�ยั���า�ภา�"
 
-#: ../app/dialogs/image-new-dialog.c:313
-#: ../app/dialogs/image-scale-dialog.c:209
+#: ../app/dialogs/image-new-dialog.c:321
+#: ../app/dialogs/image-scale-dialog.c:239
 #, c-format
 msgid "You are trying to create an image with a size of %s."
 msgstr "��า��ำลั�สร�า�ภา��ี���า� %s"
 
-#: ../app/dialogs/image-new-dialog.c:320
+#: ../app/dialogs/image-new-dialog.c:328
 #, fuzzy, c-format
 msgid ""
 "An image of the chosen size will use more memory than what is configured as "
@@ -6670,22 +10366,42 @@ msgstr ""
 "��า��อ�ภา��ี��ลือ��ห���ว�า��า�ห��วย�วาม�ำ�ี��ำห���ว��ี� \"��า�ภา�สู�สุ�\" "
 "��ห��า��า��าร�รั����� (����ะ�ี� %s)"
 
-#: ../app/dialogs/image-properties-dialog.c:57
 #: ../app/dialogs/image-properties-dialog.c:60
+#: ../app/dialogs/image-properties-dialog.c:63
 #, fuzzy
 msgid "Image Properties"
 msgstr "�ุ�_สม�ั�ิ"
 
-#: ../app/dialogs/image-scale-dialog.c:97
+#: ../app/dialogs/image-properties-dialog.c:84
+#, fuzzy
+#| msgid "_Properties"
+msgid "Properties"
+msgstr "�ุ�_สม�ั�ิ"
+
+#: ../app/dialogs/image-properties-dialog.c:89
 #, fuzzy
-msgid "dialog-title|Scale Image"
+#| msgid "Color Picker"
+msgid "Color Profile"
+msgstr "�ัว������าสี"
+
+#: ../app/dialogs/image-properties-dialog.c:94
+#, fuzzy
+#| msgid "Comme_nt:"
+msgid "Comment"
+msgstr "หมาย�_ห�ุ:"
+
+#: ../app/dialogs/image-scale-dialog.c:111
+#, fuzzy
+#| msgid "Scale Image"
+msgctxt "dialog-title"
+msgid "Scale Image"
 msgstr "�รั�สั�ส�ว�ภา�"
 
-#: ../app/dialogs/image-scale-dialog.c:175
+#: ../app/dialogs/image-scale-dialog.c:205
 msgid "Confirm Scaling"
 msgstr "ยื�ยั��าร�รั�สั�ส�ว�"
 
-#: ../app/dialogs/image-scale-dialog.c:215
+#: ../app/dialogs/image-scale-dialog.c:245
 #, fuzzy, c-format
 msgid ""
 "Scaling the image to the chosen size will make it use more memory than what "
@@ -6695,1038 +10411,1073 @@ msgstr ""
 "�าร�รั�สั�ส�ว�������า��ี�����ลือ��ว��ะ���ห��วย�วาม�ะมา��ว�า�ี��ำห���ว��ี� \"��า�ภา�สู�สุ�\" "
 "��ห��า��า��าร�รั����� (����ะ�ี� %s)"
 
-#: ../app/dialogs/image-scale-dialog.c:230
+#: ../app/dialogs/image-scale-dialog.c:260
 #, fuzzy
 msgid ""
 "Scaling the image to the chosen size will shrink some layers completely away."
 msgstr "�าร�รั�สั�ส�ว��าม��า��ี��ลือ��ะล���า��อ��า��ั���า�อย�า�สม�ูร��"
 
-#: ../app/dialogs/image-scale-dialog.c:234
+#: ../app/dialogs/image-scale-dialog.c:264
 msgid "Is this what you want to do?"
 msgstr "�ี��ือสิ���ี���า���อ��าร�ำ����หม?"
 
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:50
+#: ../app/dialogs/input-devices-dialog.c:55
+msgid "Configure Input Devices"
+msgstr "�รั�����อุ��ร��อิ��ุ�"
+
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:48
 msgid "Configure Keyboard Shortcuts"
 msgstr ""
 
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:81
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:73
 msgid ""
 "To edit a shortcut key, click on the corresponding row and type a new "
 "accelerator, or press backspace to clear."
 msgstr "���ลือ����ำ�ห�����ว��ียว�ั��ละ�ิม��"
 
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:89
-#: ../app/dialogs/preferences-dialog.c:1564
-msgid "_Save keyboard shortcuts on exit"
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:81
+#, fuzzy
+#| msgid "_Save keyboard shortcuts on exit"
+msgid "S_ave keyboard shortcuts on exit"
 msgstr "_�ั��ึ��ุ�มลั� �มื�อออ��า���ร��รม"
 
-#: ../app/dialogs/layer-add-mask-dialog.c:82
+#: ../app/dialogs/layer-add-mask-dialog.c:84
 msgid "Add a Mask to the Layer"
 msgstr "��ิ�มห��า�า����า�����ั���า�"
 
-#: ../app/dialogs/layer-add-mask-dialog.c:109
+#: ../app/dialogs/layer-add-mask-dialog.c:112
 #, fuzzy
 msgid "Initialize Layer Mask to:"
 msgstr "�ริ�ม�าร����า�ห��า�า��ั���า��ี�:"
 
-#: ../app/dialogs/layer-add-mask-dialog.c:139
+#: ../app/dialogs/layer-add-mask-dialog.c:143
 #, fuzzy
 msgid "In_vert mask"
 msgstr "_สลั�"
 
-#: ../app/dialogs/layer-options-dialog.c:124
+#: ../app/dialogs/layer-options-dialog.c:125
 #, fuzzy
 msgid "Layer _name:"
 msgstr "�ื�อ�ั�_��า�:"
 
 #. The size labels
-#: ../app/dialogs/layer-options-dialog.c:133
-#: ../app/tools/gimpmeasuretool.c:988
+#: ../app/dialogs/layer-options-dialog.c:139
+#: ../app/tools/gimpmeasuretool.c:1074
 msgid "Width:"
 msgstr "�ว�า�:"
 
-#: ../app/dialogs/layer-options-dialog.c:139
-#: ../app/tools/gimpmeasuretool.c:1014
+#: ../app/dialogs/layer-options-dialog.c:145
+#: ../app/tools/gimpmeasuretool.c:1102
 msgid "Height:"
 msgstr "สู�:"
 
-#: ../app/dialogs/layer-options-dialog.c:196
+#: ../app/dialogs/layer-options-dialog.c:202
 msgid "Layer Fill Type"
 msgstr "รู�����ั���า��หม�"
 
-#: ../app/dialogs/layer-options-dialog.c:211
+#: ../app/dialogs/layer-options-dialog.c:217
 #, fuzzy
 msgid "Set name from _text"
 msgstr "สร�า��ส���า��า�อั�ษร"
 
-#: ../app/dialogs/module-dialog.c:120
+#: ../app/dialogs/module-dialog.c:126
 #, fuzzy
-msgid "Manage Loadable Modules"
-msgstr "�ั��าร"
-
-#: ../app/dialogs/module-dialog.c:169
-msgid "Autoload"
-msgstr "�หล�อั���มั�ิ"
+#| msgid "_Module Manager"
+msgid "Module Manager"
+msgstr "�ัว�ั��าร�_ม�ูล"
 
-#: ../app/dialogs/module-dialog.c:176
+#: ../app/dialogs/module-dialog.c:150
 #, fuzzy
-msgid "Module Path"
-msgstr "�ลื�อ��ส���า�"
-
-#: ../app/dialogs/module-dialog.c:426
-msgid "<No modules>"
-msgstr ""
+#| msgid ""
+#| "You will have to restart GIMP for the following changes to take effect:"
+msgid "You will have to restart GIMP for the changes to take effect."
+msgstr "��า��ะ��อ��ริ�ม�าร�ำ�า��อ� GIMP �หม���ื�อ�ห��าร��ลี�ย���ล���า�� มี�ล:"
 
-#: ../app/dialogs/module-dialog.c:438 ../app/dialogs/module-dialog.c:447
+#: ../app/dialogs/module-dialog.c:191
 #, fuzzy
-msgid "On disk"
-msgstr "�ม�มี�����ั��ึ���อมูล"
+msgid "Module"
+msgstr "��ร��รมย�อย"
 
-#: ../app/dialogs/module-dialog.c:438
+#: ../app/dialogs/module-dialog.c:465
 msgid "Only in memory"
 msgstr "��ห��วย�วาม�ำ���า�ั��"
 
-#: ../app/dialogs/module-dialog.c:447
+#: ../app/dialogs/module-dialog.c:470
 #, fuzzy
 msgid "No longer available"
 msgstr "�ม�สามาร��������า��ล�ว"
 
-#: ../app/dialogs/module-dialog.c:483
-msgid "Load"
-msgstr "�หล�"
-
-#: ../app/dialogs/module-dialog.c:485
-msgid "Query"
-msgstr ""
-
-#: ../app/dialogs/module-dialog.c:492
-#, fuzzy
-msgid "Unload"
-msgstr "�ม��หล�"
-
-#: ../app/dialogs/module-dialog.c:507
-#, fuzzy
-msgid "Purpose:"
-msgstr "�ุ��ระส���:"
-
-#: ../app/dialogs/module-dialog.c:508
+#: ../app/dialogs/module-dialog.c:494
 msgid "Author:"
 msgstr "�ู���ีย�:"
 
-#: ../app/dialogs/module-dialog.c:509
+#: ../app/dialogs/module-dialog.c:495
 #, fuzzy
 msgid "Version:"
 msgstr "รุ��:"
 
-#: ../app/dialogs/module-dialog.c:510
-#, fuzzy
-msgid "Copyright:"
-msgstr "ลิ�สิ��ิ�:"
-
-#: ../app/dialogs/module-dialog.c:511
+#: ../app/dialogs/module-dialog.c:496
 #, fuzzy
 msgid "Date:"
 msgstr "วั��วลา:"
 
-#: ../app/dialogs/module-dialog.c:512
-msgid "Location:"
-msgstr "�ำ�ห���:"
-
-#: ../app/dialogs/module-dialog.c:513
-#: ../app/widgets/gimpcontrollereditor.c:228
-msgid "State:"
-msgstr "ส�า�ะ:"
-
-#: ../app/dialogs/module-dialog.c:514
+#: ../app/dialogs/module-dialog.c:497
 #, fuzzy
-msgid "Last error:"
-msgstr "ล���อ�ิ��ลา���า��"
+msgid "Copyright:"
+msgstr "ลิ�สิ��ิ�:"
 
-#: ../app/dialogs/module-dialog.c:515
-#, fuzzy
-msgid "Available types:"
-msgstr "�ิล��อร��ี�������"
+#: ../app/dialogs/module-dialog.c:498
+msgid "Location:"
+msgstr "�ำ�ห���:"
 
-#: ../app/dialogs/offset-dialog.c:102
+#: ../app/dialogs/offset-dialog.c:108
 msgid "Offset Layer"
 msgstr ""
 
-#: ../app/dialogs/offset-dialog.c:104
+#: ../app/dialogs/offset-dialog.c:110
 msgid "Offset Layer Mask"
 msgstr ""
 
-#: ../app/dialogs/offset-dialog.c:106
+#: ../app/dialogs/offset-dialog.c:112
 msgid "Offset Channel"
 msgstr ""
 
 #. The offset frame
-#: ../app/dialogs/offset-dialog.c:112 ../app/dialogs/offset-dialog.c:146
-#: ../app/dialogs/resize-dialog.c:196 ../app/widgets/gimpgrideditor.c:268
+#: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152
+#: ../app/dialogs/resize-dialog.c:198 ../app/widgets/gimpgrideditor.c:275
 msgid "Offset"
 msgstr ""
 
 #. offset, used as a verb
-#: ../app/dialogs/offset-dialog.c:121
+#: ../app/dialogs/offset-dialog.c:127
 msgid "_Offset"
 msgstr ""
 
-#: ../app/dialogs/offset-dialog.c:178 ../app/dialogs/resize-dialog.c:225
+#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:227
 msgid "_X:"
 msgstr "_X:"
 
-#: ../app/dialogs/offset-dialog.c:180 ../app/dialogs/resize-dialog.c:226
+#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:228
 msgid "_Y:"
 msgstr "_Y:"
 
-#: ../app/dialogs/offset-dialog.c:207
+#: ../app/dialogs/offset-dialog.c:213
 msgid "Offset by  x/_2, y/2"
 msgstr ""
 
 #. The edge behavior frame
-#: ../app/dialogs/offset-dialog.c:216
+#: ../app/dialogs/offset-dialog.c:222
 msgid "Edge Behavior"
 msgstr ""
 
-#: ../app/dialogs/offset-dialog.c:220
+#: ../app/dialogs/offset-dialog.c:226
 msgid "_Wrap around"
 msgstr ""
 
-#: ../app/dialogs/offset-dialog.c:223
+#: ../app/dialogs/offset-dialog.c:229
 msgid "Fill with _background color"
 msgstr "��ิม��วยสี�ื�_�หลั�"
 
-#: ../app/dialogs/offset-dialog.c:226
+#: ../app/dialogs/offset-dialog.c:232
 msgid "Make _transparent"
 msgstr "�ำ�ห��_�ร���ส"
 
-#: ../app/dialogs/palette-import-dialog.c:157
+#: ../app/dialogs/palette-import-dialog.c:154
 msgid "Import a New Palette"
 msgstr "�ำ���า�า�สี�หม�"
 
-#: ../app/dialogs/palette-import-dialog.c:167
+#: ../app/dialogs/palette-import-dialog.c:164
 msgid "_Import"
 msgstr "�ำ�_��า"
 
 #. The "Source" frame
-#: ../app/dialogs/palette-import-dialog.c:206
+#: ../app/dialogs/palette-import-dialog.c:203
 msgid "Select Source"
 msgstr "�ลือ��หล��"
 
-#: ../app/dialogs/palette-import-dialog.c:228
+#: ../app/dialogs/palette-import-dialog.c:214
+#: ../app/dialogs/preferences-dialog.c:1923
+msgid "_Gradient"
+msgstr "สี�_ร��า"
+
+#: ../app/dialogs/palette-import-dialog.c:225
 msgid "I_mage"
 msgstr "_ภา�"
 
-#: ../app/dialogs/palette-import-dialog.c:242
+#: ../app/dialogs/palette-import-dialog.c:239
 #, fuzzy
 msgid "Sample _Merged"
 msgstr "�ลือ����รวมภา�"
 
-#: ../app/dialogs/palette-import-dialog.c:254
+#: ../app/dialogs/palette-import-dialog.c:251
 #, fuzzy
 msgid "_Selected Pixels only"
 msgstr "_�ื���ี��ลือ�"
 
-#: ../app/dialogs/palette-import-dialog.c:266
+#: ../app/dialogs/palette-import-dialog.c:263
 msgid "Palette _file"
 msgstr "���ม_�า�สี"
 
 #. Palette file name entry
-#: ../app/dialogs/palette-import-dialog.c:295
+#: ../app/dialogs/palette-import-dialog.c:292
 #, fuzzy
 msgid "Select Palette File"
 msgstr "�ลือ����ม�า�สี"
 
 #. The "Import" frame
-#: ../app/dialogs/palette-import-dialog.c:306
+#: ../app/dialogs/palette-import-dialog.c:303
 msgid "Import Options"
 msgstr "�ำ���า�ัว�ลือ�"
 
-#: ../app/dialogs/palette-import-dialog.c:320
+#: ../app/dialogs/palette-import-dialog.c:317
 msgid "New import"
 msgstr "�ำ���า�หม�"
 
-#: ../app/dialogs/palette-import-dialog.c:322
+#: ../app/dialogs/palette-import-dialog.c:319
 msgid "Palette _name:"
 msgstr "�ื�อ_�า�สี:"
 
-#: ../app/dialogs/palette-import-dialog.c:328
+#: ../app/dialogs/palette-import-dialog.c:325
 msgid "N_umber of colors:"
 msgstr "�ำ�ว�สี:"
 
-#: ../app/dialogs/palette-import-dialog.c:341
+#: ../app/dialogs/palette-import-dialog.c:338
 msgid "C_olumns:"
 msgstr ""
 
-#: ../app/dialogs/palette-import-dialog.c:353
+#: ../app/dialogs/palette-import-dialog.c:350
 msgid "I_nterval:"
 msgstr "��_ว��วลา:"
 
 #. The "Preview" frame
-#: ../app/dialogs/palette-import-dialog.c:364
+#: ../app/dialogs/palette-import-dialog.c:361
 msgid "Preview"
 msgstr "�ส���ัวอย�า�"
 
-#: ../app/dialogs/palette-import-dialog.c:385
+#: ../app/dialogs/palette-import-dialog.c:382
 msgid "The selected source contains no colors."
 msgstr "�ม�มีสี��� ���หล����อมูล�ี��ลือ�"
 
-#: ../app/dialogs/preferences-dialog.c:260
+#: ../app/dialogs/preferences-dialog.c:266
 #, fuzzy
 msgid "Reset All Preferences"
 msgstr "�าม��า�_��าร�รั�����"
 
-#: ../app/dialogs/preferences-dialog.c:278
+#: ../app/dialogs/preferences-dialog.c:284
 #, fuzzy
 msgid "Do you really want to reset all preferences to default values?"
 msgstr "�ุ���อ��าร�ี��ะ�ั����า�ิล��อร�������า�ริยาย���หรือ�ม�?"
 
-#: ../app/dialogs/preferences-dialog.c:348
+#: ../app/dialogs/preferences-dialog.c:354
 msgid "You will have to restart GIMP for the following changes to take effect:"
 msgstr "��า��ะ��อ��ริ�ม�าร�ำ�า��อ� GIMP �หม���ื�อ�ห��าร��ลี�ย���ล���า�� มี�ล:"
 
-#: ../app/dialogs/preferences-dialog.c:487
-msgid "Configure Input Devices"
-msgstr "�รั�����อุ��ร��อิ��ุ�"
-
-#: ../app/dialogs/preferences-dialog.c:564
+#: ../app/dialogs/preferences-dialog.c:538
 msgid ""
 "Your keyboard shortcuts will be reset to default values the next time you "
 "start GIMP."
 msgstr "�ุ�มลั��อ���า��ะ�ลั�������า�ริยาย���รั����อ���ี��ริ�ม��� GIMP"
 
-#: ../app/dialogs/preferences-dialog.c:575
+#: ../app/dialogs/preferences-dialog.c:549
 msgid "Remove all Keyboard Shortcuts"
 msgstr "�อา�ุ��ุ�มลั�ออ�"
 
-#: ../app/dialogs/preferences-dialog.c:597
+#: ../app/dialogs/preferences-dialog.c:571
 msgid "Do you really want to remove all keyboard shortcuts from all menus?"
 msgstr "�ุ���อ��าร�ี��ะ�อา�ุ��ุ�มลั�ออ��า��ุ��ม�ู�ริยาย���หรือ�ม�?"
 
-#: ../app/dialogs/preferences-dialog.c:638
+#: ../app/dialogs/preferences-dialog.c:612
 msgid ""
 "Your window setup will be reset to default values the next time you start "
 "GIMP."
 msgstr "�าร�ั����าห��า��า��อ���า��ะ�ู��ลั�������า�ริยาย���รั����อ���ี��ริ�ม��� GIMP"
 
-#: ../app/dialogs/preferences-dialog.c:673
+#: ../app/dialogs/preferences-dialog.c:647
 msgid ""
 "Your input device settings will be reset to default values the next time you "
 "start GIMP."
 msgstr "�าร�ั����าอุ��ร��อิ��ุ��อ���า��ะ�ู��ลั�������า�ริยาย���รั����อ���ี��ริ�ม��� GIMP"
 
-#: ../app/dialogs/preferences-dialog.c:708
+#: ../app/dialogs/preferences-dialog.c:682
 msgid ""
 "Your tool options will be reset to default values the next time you start "
 "GIMP."
 msgstr "�ัว�ลือ���รื�อ�มือ�อ���า��ะ�ู��ลั�������า�ริยาย���รั����อ���ี��ริ�ม��� GIMP"
 
-#: ../app/dialogs/preferences-dialog.c:1200
+#: ../app/dialogs/preferences-dialog.c:1266
 #, fuzzy
 msgid "Show _menubar"
 msgstr "�ส���_���ม�ู"
 
-#: ../app/dialogs/preferences-dialog.c:1203
+#: ../app/dialogs/preferences-dialog.c:1270
 msgid "Show _rulers"
 msgstr "�ส���ม�_�รร�ั�"
 
-#: ../app/dialogs/preferences-dialog.c:1206
+#: ../app/dialogs/preferences-dialog.c:1273
 msgid "Show scroll_bars"
 msgstr "�ส������_ลื�อ�"
 
-#: ../app/dialogs/preferences-dialog.c:1209
+#: ../app/dialogs/preferences-dialog.c:1276
 msgid "Show s_tatusbar"
 msgstr "�ส�����ส_�า�ะ"
 
-#: ../app/dialogs/preferences-dialog.c:1217
+#: ../app/dialogs/preferences-dialog.c:1284
 msgid "Show s_election"
 msgstr "�ส���ื���ี�_�าร�ลือ�"
 
-#: ../app/dialogs/preferences-dialog.c:1220
+#: ../app/dialogs/preferences-dialog.c:1287
 msgid "Show _layer boundary"
 msgstr "�ส���อ��_���ั���า�"
 
-#: ../app/dialogs/preferences-dialog.c:1223
+#: ../app/dialogs/preferences-dialog.c:1290
 msgid "Show _guides"
 msgstr "�ส���ส��_�ำ��ว"
 
-#: ../app/dialogs/preferences-dialog.c:1226
+#: ../app/dialogs/preferences-dialog.c:1293
 msgid "Show gri_d"
 msgstr "�ส���ส��_�ิ�ั�"
 
-#: ../app/dialogs/preferences-dialog.c:1232
+#: ../app/dialogs/preferences-dialog.c:1299
 msgid "Canvas _padding mode:"
 msgstr "ระ��_�อ��อ�ห��า�ระ�าษ:"
 
-#: ../app/dialogs/preferences-dialog.c:1237
+#: ../app/dialogs/preferences-dialog.c:1304
 msgid "Custom p_adding color:"
 msgstr "สี�อ�_�อ��ลือ��อ�:"
 
-#: ../app/dialogs/preferences-dialog.c:1238
+#: ../app/dialogs/preferences-dialog.c:1305
 msgid "Select Custom Canvas Padding Color"
 msgstr "�ลือ���าสี�อ��อ�ห��า�ระ�าษ��อ�"
 
-#: ../app/dialogs/preferences-dialog.c:1326
+#: ../app/dialogs/preferences-dialog.c:1394
 msgid "Preferences"
 msgstr "�รั�����"
 
-#: ../app/dialogs/preferences-dialog.c:1442
-#: ../app/dialogs/preferences-dialog.c:2604
+#: ../app/dialogs/preferences-dialog.c:1507
+#: ../app/dialogs/preferences-dialog.c:2760
 #, fuzzy
 msgid "Environment"
 msgstr "สภา��ว�ล�อม"
 
-#: ../app/dialogs/preferences-dialog.c:1456
+#: ../app/dialogs/preferences-dialog.c:1521
 msgid "Resource Consumption"
 msgstr "�ริมา��าร����หล����อมูล"
 
-#: ../app/dialogs/preferences-dialog.c:1466
+#: ../app/dialogs/preferences-dialog.c:1531
 msgid "Minimal number of _undo levels:"
 msgstr "�ำ�ว���อย�ี�สุ��อ�ระ�ั��าร_ย��ลิ��าร�ระ�ำ"
 
-#: ../app/dialogs/preferences-dialog.c:1469
+#: ../app/dialogs/preferences-dialog.c:1534
 msgid "Maximum undo _memory:"
 msgstr "ห��วย�วาม�ำ�าร�รีย�_�ื��าร�ำสู�สุ�:"
 
-#: ../app/dialogs/preferences-dialog.c:1472
+#: ../app/dialogs/preferences-dialog.c:1537
 msgid "Tile cache _size:"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:1475
+#: ../app/dialogs/preferences-dialog.c:1540
 msgid "Maximum _new image size:"
 msgstr "��า��ห��สุ_��อ�ภา��หม�:"
 
-#: ../app/dialogs/preferences-dialog.c:1480
+#: ../app/dialogs/preferences-dialog.c:1545
 msgid "Number of _processors to use:"
 msgstr "�ำ�ว��อ�ห��วย_�ระมวล�ล�ี����:"
 
 #. Image Thumbnails
-#: ../app/dialogs/preferences-dialog.c:1485
+#: ../app/dialogs/preferences-dialog.c:1550
 #, fuzzy
 msgid "Image Thumbnails"
 msgstr "ภา�ย�อ"
 
-#: ../app/dialogs/preferences-dialog.c:1490
+#: ../app/dialogs/preferences-dialog.c:1555
 msgid "Size of _thumbnails:"
 msgstr "��า��อ�_ภา�ย�อ"
 
-#: ../app/dialogs/preferences-dialog.c:1494
+#: ../app/dialogs/preferences-dialog.c:1559
 msgid "Maximum _filesize for thumbnailing:"
 msgstr "��า����มสู�สุ��ี��ำ����_รู�ย�อ:"
 
 #. File Saving
-#: ../app/dialogs/preferences-dialog.c:1498
+#: ../app/dialogs/preferences-dialog.c:1563
 msgid "Saving Images"
 msgstr "�ำลั��ั��ึ�ภา���า��"
 
-#: ../app/dialogs/preferences-dialog.c:1501
+#: ../app/dialogs/preferences-dialog.c:1566
 msgid "Confirm closing of unsa_ved images"
 msgstr "ยื�ยั��าร�ิ�ภา��ี��ม��_���ั��ึ�"
 
-#: ../app/dialogs/preferences-dialog.c:1511
-msgid "Save document _history on exit"
-msgstr "�ั��ึ�ราย�าร�ระวั�ิ�ิ���า��มื�อออ��า���ร��รม"
+#: ../app/dialogs/preferences-dialog.c:1576
+msgid "Keep record of used files in the Recent Documents list"
+msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:1520
+#: ../app/dialogs/preferences-dialog.c:1585
 msgid "User Interface"
 msgstr "ห��า�อ�ิ���อ�ู����"
 
-#: ../app/dialogs/preferences-dialog.c:1523
+#: ../app/dialogs/preferences-dialog.c:1588
 msgid "Interface"
 msgstr "ห��า�อ�ิ���อ"
 
+#: ../app/dialogs/preferences-dialog.c:1598
+#, fuzzy
+#| msgid "Large"
+msgid "Language"
+msgstr "�ห��"
+
 #. Previews
-#: ../app/dialogs/preferences-dialog.c:1530
+#: ../app/dialogs/preferences-dialog.c:1604
 msgid "Previews"
 msgstr "�ัวอย�า��าร�ส��"
 
-#: ../app/dialogs/preferences-dialog.c:1533
+#: ../app/dialogs/preferences-dialog.c:1607
 msgid "_Enable layer & channel previews"
 msgstr "��ิ��_���าร�ส���ัวอย�า��ั���า��ละ�����ล"
 
-#: ../app/dialogs/preferences-dialog.c:1539
+#: ../app/dialogs/preferences-dialog.c:1613
 #, fuzzy
 msgid "_Default layer & channel preview size:"
 msgstr "��า��าร�ส_���ัวอย�า��ริยาย�อ��ั���า��ละ�����ล"
 
-#: ../app/dialogs/preferences-dialog.c:1542
+#: ../app/dialogs/preferences-dialog.c:1616
 msgid "Na_vigation preview size:"
 msgstr "��า��าร�ส���ัวอย�า��าร_�ำ�า�:"
 
 #. Keyboard Shortcuts
-#: ../app/dialogs/preferences-dialog.c:1546
+#: ../app/dialogs/preferences-dialog.c:1620
 msgid "Keyboard Shortcuts"
 msgstr "�ุ�มลั�"
 
-#: ../app/dialogs/preferences-dialog.c:1550
-msgid "Show menu _mnemonics (access keys)"
-msgstr ""
-
-#: ../app/dialogs/preferences-dialog.c:1553
+#: ../app/dialogs/preferences-dialog.c:1624
 #, fuzzy
 msgid "_Use dynamic keyboard shortcuts"
 msgstr "����ุ�มลั�"
 
-#: ../app/dialogs/preferences-dialog.c:1557
+#: ../app/dialogs/preferences-dialog.c:1628
 msgid "Configure _Keyboard Shortcuts..."
 msgstr "�รั�����_�ุ�มลั�..."
 
-#: ../app/dialogs/preferences-dialog.c:1568
+#: ../app/dialogs/preferences-dialog.c:1635
+msgid "_Save keyboard shortcuts on exit"
+msgstr "_�ั��ึ��ุ�มลั� �มื�อออ��า���ร��รม"
+
+#: ../app/dialogs/preferences-dialog.c:1639
 msgid "Save Keyboard Shortcuts _Now"
 msgstr "�ั��ึ��ุ�มลั�_�ั��ี"
 
-#: ../app/dialogs/preferences-dialog.c:1575
-msgid "_Reset Saved Keyboard Shortcuts to Default Values"
+#: ../app/dialogs/preferences-dialog.c:1646
+#, fuzzy
+#| msgid "_Reset Saved Keyboard Shortcuts to Default Values"
+msgid "_Reset Keyboard Shortcuts to Default Values"
 msgstr "�ั����า�ุ�มลั��ี��ั��ึ��_หม�������า�ริยาย"
 
-#: ../app/dialogs/preferences-dialog.c:1585
+#: ../app/dialogs/preferences-dialog.c:1655
 msgid "Remove _All Keyboard Shortcuts"
 msgstr "�อา�ุ�มลั�_�ุ���ุมออ�"
 
-#: ../app/dialogs/preferences-dialog.c:1597
-#: ../app/dialogs/preferences-dialog.c:1636
+#: ../app/dialogs/preferences-dialog.c:1667
+#: ../app/dialogs/preferences-dialog.c:1706
 msgid "Theme"
 msgstr "�ุ�������"
 
-#: ../app/dialogs/preferences-dialog.c:1606
+#: ../app/dialogs/preferences-dialog.c:1676
 msgid "Select Theme"
 msgstr "�ลือ��ุ�������"
 
-#: ../app/dialogs/preferences-dialog.c:1688
+#: ../app/dialogs/preferences-dialog.c:1758
 msgid "Reload C_urrent Theme"
 msgstr "�หล��ุ��������ั��ุ�ั�อี��รั��"
 
-#: ../app/dialogs/preferences-dialog.c:1700
+#: ../app/dialogs/preferences-dialog.c:1770
 msgid "Help System"
 msgstr "ระ����วย�หลือ"
 
 #. General
-#: ../app/dialogs/preferences-dialog.c:1712
-#: ../app/dialogs/preferences-dialog.c:1763
-#: ../app/dialogs/preferences-dialog.c:1950
-#: ../app/widgets/gimpcontrollereditor.c:183
+#: ../app/dialogs/preferences-dialog.c:1782
+#: ../app/dialogs/preferences-dialog.c:1866
+#: ../app/dialogs/preferences-dialog.c:2066
+#: ../app/widgets/gimpcontrollereditor.c:188
 msgid "General"
 msgstr "�ั�ว��"
 
-#: ../app/dialogs/preferences-dialog.c:1715
+#: ../app/dialogs/preferences-dialog.c:1785
 msgid "Show _tooltips"
 msgstr "�ส��_��ล��ลั��อ���รื�อ�มือ"
 
-#: ../app/dialogs/preferences-dialog.c:1718
+#: ../app/dialogs/preferences-dialog.c:1788
 msgid "Show help _buttons"
 msgstr "�ส���ุ�_ม��วย�หลือ"
 
-#: ../app/dialogs/preferences-dialog.c:1721
-msgid "Show tips on _startup"
-msgstr "�ส����ล��ลั��มื�อ�_ริ�ม��ร��รม"
+#: ../app/dialogs/preferences-dialog.c:1801
+msgid "Use the online version"
+msgstr ""
+
+#: ../app/dialogs/preferences-dialog.c:1802
+msgid "Use a locally installed copy"
+msgstr ""
+
+#: ../app/dialogs/preferences-dialog.c:1803
+msgid "User manual:"
+msgstr ""
+
+#: ../app/dialogs/preferences-dialog.c:1810
+msgid "There's a local installation of the user manual."
+msgstr ""
+
+#: ../app/dialogs/preferences-dialog.c:1815
+msgid "The user manual is not installed locally."
+msgstr ""
 
 #. Help Browser
-#: ../app/dialogs/preferences-dialog.c:1725
+#: ../app/dialogs/preferences-dialog.c:1838
 msgid "Help Browser"
 msgstr "��ราว���อร���วย�หลือ"
 
-#: ../app/dialogs/preferences-dialog.c:1729
+#: ../app/dialogs/preferences-dialog.c:1842
 msgid "H_elp browser to use:"
 msgstr "��ราว��_�อร���วย�หลือ�ี��ะ���:"
 
-#: ../app/dialogs/preferences-dialog.c:1734
-msgid "Web Browser"
-msgstr "�ว����ราว���อร�"
-
-#: ../app/dialogs/preferences-dialog.c:1738
-msgid "_Web browser to use:"
-msgstr "�_ว����ราว���อร��ี��ะ���:"
-
-#: ../app/dialogs/preferences-dialog.c:1766
+#: ../app/dialogs/preferences-dialog.c:1869
 msgid "_Save tool options on exit"
 msgstr "_�ั��ึ��ัว�ลือ���รื�อ�มือ�มื�อออ��า���ร��รม"
 
-#: ../app/dialogs/preferences-dialog.c:1770
+#: ../app/dialogs/preferences-dialog.c:1873
 msgid "Save Tool Options _Now"
 msgstr "�ั��ึ��ัว�ลือ���รื�อ�มือ_�ั��ี"
 
-#: ../app/dialogs/preferences-dialog.c:1777
+#: ../app/dialogs/preferences-dialog.c:1880
 msgid "_Reset Saved Tool Options to Default Values"
 msgstr "_�ั����า�ัว�ลือ���รื�อ�มือ�ี��ั��ี�������า�ริยาย"
 
 #. Snapping Distance
-#: ../app/dialogs/preferences-dialog.c:1787
+#: ../app/dialogs/preferences-dialog.c:1890
 msgid "Guide & Grid Snapping"
 msgstr "�าร�รึ��ั��ส���ำ��ว�ละ�ส���ิ�ั�"
 
-#: ../app/dialogs/preferences-dialog.c:1792
+#: ../app/dialogs/preferences-dialog.c:1895
 msgid "_Snap distance:"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:1800
+#: ../app/dialogs/preferences-dialog.c:1903
 msgid "Default _interpolation:"
 msgstr "��า�ริยาย_วิ�ี�าร�ระมา���า:"
 
 #. Global Brush, Pattern, ...
-#: ../app/dialogs/preferences-dialog.c:1807
+#: ../app/dialogs/preferences-dialog.c:1910
 msgid "Paint Options Shared Between Tools"
 msgstr "��รื�อ�มือ��า�� ����ัว�ลือ��าร�าสีร�วม�ั�"
 
-#: ../app/dialogs/preferences-dialog.c:1820
+#: ../app/dialogs/preferences-dialog.c:1914
+msgid "_Brush"
+msgstr "_หัว��ร�"
+
+#: ../app/dialogs/preferences-dialog.c:1917
+msgid "_Dynamics"
+msgstr ""
+
+#: ../app/dialogs/preferences-dialog.c:1920
+msgid "_Pattern"
+msgstr "�_��ลาย"
+
+#: ../app/dialogs/preferences-dialog.c:1926
 msgid "Move Tool"
 msgstr "��รื�อ�มือ��ลื�อ�ย�าย"
 
-#: ../app/dialogs/preferences-dialog.c:1824
+#: ../app/dialogs/preferences-dialog.c:1930
 #, fuzzy
 msgid "Set layer or path as active"
 msgstr "�ั����า�วาม�ึ��ั���า�"
 
-#: ../app/dialogs/preferences-dialog.c:1837
-msgid "Toolbox"
-msgstr "�ล�อ���รื�อ�มือ"
-
 #. Appearance
-#: ../app/dialogs/preferences-dialog.c:1849
-#: ../app/dialogs/preferences-dialog.c:2023
-#: ../app/widgets/gimpgrideditor.c:196
+#: ../app/dialogs/preferences-dialog.c:1955
+#: ../app/dialogs/preferences-dialog.c:2139
+#: ../app/widgets/gimpgrideditor.c:203
 msgid "Appearance"
 msgstr "รู�����าร�ส��"
 
-#: ../app/dialogs/preferences-dialog.c:1853
+#: ../app/dialogs/preferences-dialog.c:1959
 msgid "Show _foreground & background color"
 msgstr "�ส��_สี�ี��ห��า�ละสี�ื��หลั�"
 
-#: ../app/dialogs/preferences-dialog.c:1857
+#: ../app/dialogs/preferences-dialog.c:1963
 msgid "Show active _brush, pattern & gradient"
 msgstr "�ส��_หัว��ร�, ���ลาย �ละ����ล�สี�ี�����า�อยู�"
 
-#: ../app/dialogs/preferences-dialog.c:1861
+#: ../app/dialogs/preferences-dialog.c:1967
 msgid "Show active _image"
 msgstr "�ส��ภา�_�ี��ำ�า�อยู�"
 
-#: ../app/dialogs/preferences-dialog.c:1874
+#. Tool Editor
+#: ../app/dialogs/preferences-dialog.c:1975
+#, fuzzy
+#| msgid "Resource configuration"
+msgid "Tools configuration"
+msgstr "�าร�ำห����า�หล����อมูล"
+
+#: ../app/dialogs/preferences-dialog.c:1990
 #, fuzzy
 msgid "Default New Image"
 msgstr "สร�า�ภา��หม��ริยาย"
 
-#: ../app/dialogs/preferences-dialog.c:1877
+#: ../app/dialogs/preferences-dialog.c:1993
 msgid "Default Image"
 msgstr "ภา��ริยาย"
 
-#: ../app/dialogs/preferences-dialog.c:1914
+#: ../app/dialogs/preferences-dialog.c:2030
 msgid "Default Image Grid"
 msgstr "�ส���ิ�ั�ภา��ริยาย"
 
-#: ../app/dialogs/preferences-dialog.c:1917
+#: ../app/dialogs/preferences-dialog.c:2033
 msgid "Default Grid"
 msgstr "�ส���ิ�ั��ริยาย"
 
-#: ../app/dialogs/preferences-dialog.c:1938
+#: ../app/dialogs/preferences-dialog.c:2054
 msgid "Image Windows"
 msgstr "ห��า��า�ภา�"
 
-#: ../app/dialogs/preferences-dialog.c:1953
+#: ../app/dialogs/preferences-dialog.c:2069
 msgid "Use \"_Dot for dot\" by default"
 msgstr "��� \" _�ุ���อ�ุ�\" ��ย�ริยาย"
 
-#: ../app/dialogs/preferences-dialog.c:1959
+#: ../app/dialogs/preferences-dialog.c:2075
 #, fuzzy
 msgid "Marching _ants speed:"
 msgstr "�วาม�ร�ว"
 
 #. Zoom & Resize Behavior
-#: ../app/dialogs/preferences-dialog.c:1963
+#: ../app/dialogs/preferences-dialog.c:2079
 msgid "Zoom & Resize Behavior"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:1967
+#: ../app/dialogs/preferences-dialog.c:2083
 msgid "Resize window on _zoom"
 msgstr "�รั���า�ห��า��า��าม�า_รย�อ�ยาย"
 
-#: ../app/dialogs/preferences-dialog.c:1970
+#: ../app/dialogs/preferences-dialog.c:2086
 msgid "Resize window on image _size change"
 msgstr "�รั���า�ห��า��า��มื�อ��า_�ภา���ลี�ย�"
 
-#: ../app/dialogs/preferences-dialog.c:1976
+#: ../app/dialogs/preferences-dialog.c:2092
 msgid "Fit to window"
 msgstr "�อ�ี�ั�ห��า��า�"
 
-#: ../app/dialogs/preferences-dialog.c:1978
+#: ../app/dialogs/preferences-dialog.c:2094
 msgid "Initial zoom _ratio:"
 msgstr "อั�รา�ยาย�_ริ�ม���:"
 
 #. Space Bar
-#: ../app/dialogs/preferences-dialog.c:1982
+#: ../app/dialogs/preferences-dialog.c:2098
 #, fuzzy
 msgid "Space Bar"
 msgstr "�รั�สั�ส�ว��ั���า�"
 
-#: ../app/dialogs/preferences-dialog.c:1988
+#: ../app/dialogs/preferences-dialog.c:2104
 msgid "_While space bar is pressed:"
 msgstr ""
 
 #. Mouse Pointers
-#: ../app/dialogs/preferences-dialog.c:1992
+#: ../app/dialogs/preferences-dialog.c:2108
 msgid "Mouse Pointers"
 msgstr "�ัว�ี��มาส�"
 
-#: ../app/dialogs/preferences-dialog.c:1996
+#: ../app/dialogs/preferences-dialog.c:2112
 msgid "Show _brush outline"
 msgstr "�ส���_ส����ร�หัว��ร�"
 
-#: ../app/dialogs/preferences-dialog.c:1999
+#: ../app/dialogs/preferences-dialog.c:2115
 msgid "Show pointer for paint _tools"
 msgstr "�ส���ัว�ี�สำหรั���รื�อ�มือ_�าสี"
 
-#: ../app/dialogs/preferences-dialog.c:2005
+#: ../app/dialogs/preferences-dialog.c:2121
 msgid "Pointer _mode:"
 msgstr "ระ���ัว_�ี�:"
 
-#: ../app/dialogs/preferences-dialog.c:2008
+#: ../app/dialogs/preferences-dialog.c:2124
 msgid "Pointer re_ndering:"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2020
+#: ../app/dialogs/preferences-dialog.c:2136
 msgid "Image Window Appearance"
 msgstr "�าร�ส��ห��า��า�ภา�"
 
-#: ../app/dialogs/preferences-dialog.c:2031
+#: ../app/dialogs/preferences-dialog.c:2147
 msgid "Default Appearance in Normal Mode"
 msgstr "สิ���ี��รา���ร��ริ�ม��ระ�����ิ"
 
-#: ../app/dialogs/preferences-dialog.c:2036
+#: ../app/dialogs/preferences-dialog.c:2152
 msgid "Default Appearance in Fullscreen Mode"
 msgstr "สิ���ี��รา���ร��ริ�ม��ระ���ส�����ม�อ"
 
-#: ../app/dialogs/preferences-dialog.c:2045
+#: ../app/dialogs/preferences-dialog.c:2161
 msgid "Image Title & Statusbar Format"
 msgstr "�ื�อภา��ละรู�������ส�า�ะ"
 
-#: ../app/dialogs/preferences-dialog.c:2048
+#: ../app/dialogs/preferences-dialog.c:2164
 msgid "Title & Status"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2066
+#: ../app/dialogs/preferences-dialog.c:2182
 #, fuzzy
 msgid "Current format"
 msgstr "ส�า�ะ�ั��ุ�ั�"
 
-#: ../app/dialogs/preferences-dialog.c:2067
+#: ../app/dialogs/preferences-dialog.c:2183
 #, fuzzy
 msgid "Default format"
 msgstr "สี�ร_��ริ�ม"
 
-#: ../app/dialogs/preferences-dialog.c:2068
+#: ../app/dialogs/preferences-dialog.c:2184
 msgid "Show zoom percentage"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2069
+#: ../app/dialogs/preferences-dialog.c:2185
 msgid "Show zoom ratio"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2070
+#: ../app/dialogs/preferences-dialog.c:2186
 msgid "Show image size"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2083
+#: ../app/dialogs/preferences-dialog.c:2199
 msgid "Image Title Format"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2085
+#: ../app/dialogs/preferences-dialog.c:2201
 msgid "Image Statusbar Format"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2170
+#: ../app/dialogs/preferences-dialog.c:2286
 msgid "Display"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2186
+#. Transparency
+#: ../app/dialogs/preferences-dialog.c:2298
+msgid "Transparency"
+msgstr "��ร���ส"
+
+#: ../app/dialogs/preferences-dialog.c:2302
 #, fuzzy
 msgid "_Check style:"
 msgstr "ลั�ษ�ะ_�ลาย�ส��:"
 
-#: ../app/dialogs/preferences-dialog.c:2189
+#: ../app/dialogs/preferences-dialog.c:2305
 msgid "Check _size:"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2192
-msgid "Get Monitor Resolution"
-msgstr ""
+#: ../app/dialogs/preferences-dialog.c:2308
+#, fuzzy
+#| msgid "Calibrate Monitor Resolution"
+msgid "Monitor Resolution"
+msgstr "�รั�มา�ร�า��วามละ�อีย��อภา�"
 
-#: ../app/dialogs/preferences-dialog.c:2196
-#: ../app/widgets/gimpcursorview.c:123 ../app/widgets/gimpgrideditor.c:261
-#: ../app/widgets/gimpgrideditor.c:293
+#. Pixels
+#: ../app/dialogs/preferences-dialog.c:2312
+#: ../app/display/gimpcursorview.c:200 ../app/widgets/gimpgrideditor.c:268
+#: ../app/widgets/gimpgrideditor.c:300
 msgid "Pixels"
 msgstr "�ุ�ภา�"
 
-#: ../app/dialogs/preferences-dialog.c:2218
-#: ../app/widgets/gimpimagepropview.c:455
+#: ../app/dialogs/preferences-dialog.c:2330
+msgid "Horizontal"
+msgstr "��ว�อ�"
+
+#: ../app/dialogs/preferences-dialog.c:2332
+msgid "Vertical"
+msgstr "��ว�ั��"
+
+#: ../app/dialogs/preferences-dialog.c:2334
+#: ../app/widgets/gimpimagepropview.c:475
 msgid "ppi"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2234
+#: ../app/dialogs/preferences-dialog.c:2350
 #, c-format
-msgid "From _windowing system (currently %d Ã? %d ppi)"
+msgid "_Detect automatically (currently %d Ã? %d ppi)"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2255
-msgid "_Manually"
+#: ../app/dialogs/preferences-dialog.c:2370
+msgid "_Enter manually"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2270
+#: ../app/dialogs/preferences-dialog.c:2385
 msgid "C_alibrate..."
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2292
+#: ../app/dialogs/preferences-dialog.c:2408
 #, fuzzy
 msgid "Color Management"
 msgstr "ราย�าร�ั�สี"
 
-#: ../app/dialogs/preferences-dialog.c:2312
+#: ../app/dialogs/preferences-dialog.c:2428
 msgid "_RGB profile:"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2313
+#: ../app/dialogs/preferences-dialog.c:2429
 #, fuzzy
 msgid "Select RGB Color Profile"
 msgstr "�ลือ��ามสี"
 
-#: ../app/dialogs/preferences-dialog.c:2314
+#: ../app/dialogs/preferences-dialog.c:2430
 msgid "_CMYK profile:"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2315
+#: ../app/dialogs/preferences-dialog.c:2431
 #, fuzzy
 msgid "Select CMYK Color Profile"
 msgstr "�ลือ��า�สี"
 
-#: ../app/dialogs/preferences-dialog.c:2316
+#: ../app/dialogs/preferences-dialog.c:2432
 msgid "_Monitor profile:"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2317
+#: ../app/dialogs/preferences-dialog.c:2433
 #, fuzzy
 msgid "Select Monitor Color Profile"
 msgstr "�ลือ�สีหลั���ื�อ�ำ�าร�����"
 
-#: ../app/dialogs/preferences-dialog.c:2318
+#: ../app/dialogs/preferences-dialog.c:2434
 msgid "_Print simulation profile:"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2319
+#: ../app/dialogs/preferences-dialog.c:2435
 #, fuzzy
 msgid "Select Printer Color Profile"
 msgstr "�ลือ�สีหลั���ื�อ�ำ�าร�����"
 
-#: ../app/dialogs/preferences-dialog.c:2328
+#: ../app/dialogs/preferences-dialog.c:2446
 msgid "_Mode of operation:"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2331
+#: ../app/dialogs/preferences-dialog.c:2476
+msgid "_Try to use the system monitor profile"
+msgstr ""
+
+#: ../app/dialogs/preferences-dialog.c:2486
 msgid "_Display rendering intent:"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2334
+#: ../app/dialogs/preferences-dialog.c:2495
 msgid "_Softproof rendering intent:"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2356
-msgid "_Try to obtain the monitor profile from the X server"
+#: ../app/dialogs/preferences-dialog.c:2508
+msgid "Mark out of gamut colors"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2375
+#: ../app/dialogs/preferences-dialog.c:2513
+#, fuzzy
+#| msgid "Select Color"
+msgid "Select Warning Color"
+msgstr "�ลือ�สี"
+
+#: ../app/dialogs/preferences-dialog.c:2526
+#, fuzzy
+#| msgid "File Open _Dialog"
+msgid "File Open behaviour:"
+msgstr "_�ล�อ�����อ�สำหรั���ิ����ม"
+
+#: ../app/dialogs/preferences-dialog.c:2538
 msgid "Input Devices"
 msgstr ""
 
 #. Extended Input Devices
-#: ../app/dialogs/preferences-dialog.c:2385
+#: ../app/dialogs/preferences-dialog.c:2548
 msgid "Extended Input Devices"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2389
+#: ../app/dialogs/preferences-dialog.c:2552
 msgid "Configure E_xtended Input Devices..."
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2396
+#: ../app/dialogs/preferences-dialog.c:2559
 msgid "_Save input device settings on exit"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2400
+#: ../app/dialogs/preferences-dialog.c:2563
 msgid "Save Input Device Settings _Now"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2407
+#: ../app/dialogs/preferences-dialog.c:2570
 msgid "_Reset Saved Input Device Settings to Default Values"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2422
+#: ../app/dialogs/preferences-dialog.c:2585
 msgid "Additional Input Controllers"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2425
+#: ../app/dialogs/preferences-dialog.c:2588
 msgid "Input Controllers"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2441
+#: ../app/dialogs/preferences-dialog.c:2604
 msgid "Window Management"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2450
+#: ../app/dialogs/preferences-dialog.c:2613
 msgid "Window Manager Hints"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2456
-msgid "Hint for the _toolbox:"
-msgstr ""
-
-#: ../app/dialogs/preferences-dialog.c:2460
-msgid "Hint for other _docks:"
-msgstr ""
-
-#: ../app/dialogs/preferences-dialog.c:2465
-msgid "Toolbox and other docks are transient to the active image window"
+#: ../app/dialogs/preferences-dialog.c:2619
+msgid "Hint for _docks and toolbox:"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2470
+#: ../app/dialogs/preferences-dialog.c:2622
 msgid "Focus"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2474
+#: ../app/dialogs/preferences-dialog.c:2626
 msgid "Activate the _focused image"
 msgstr ""
 
 #. Window Positions
-#: ../app/dialogs/preferences-dialog.c:2478
+#: ../app/dialogs/preferences-dialog.c:2630
 msgid "Window Positions"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2481
+#: ../app/dialogs/preferences-dialog.c:2633
 msgid "_Save window positions on exit"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2485
+#: ../app/dialogs/preferences-dialog.c:2637
 msgid "Save Window Positions _Now"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2492
+#: ../app/dialogs/preferences-dialog.c:2644
 msgid "_Reset Saved Window Positions to Default Values"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2507
+#: ../app/dialogs/preferences-dialog.c:2659
 msgid "Folders"
 msgstr "��ล��อร�"
 
-#: ../app/dialogs/preferences-dialog.c:2527
+#: ../app/dialogs/preferences-dialog.c:2679
 #, fuzzy
 msgid "Temporary folder:"
 msgstr "��ล��อร��ั�ว�ราว:"
 
-#: ../app/dialogs/preferences-dialog.c:2528
+#: ../app/dialogs/preferences-dialog.c:2680
 msgid "Select Folder for Temporary Files"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2532
+#: ../app/dialogs/preferences-dialog.c:2684
 msgid "Swap folder:"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2533
+#: ../app/dialogs/preferences-dialog.c:2685
 msgid "Select Swap Folder"
 msgstr "�ลือ���ล��อร�ส�ว��"
 
-#: ../app/dialogs/preferences-dialog.c:2568
+#: ../app/dialogs/preferences-dialog.c:2720
 msgid "Brush Folders"
 msgstr "��ล��อร�หัว��ร�"
 
-#: ../app/dialogs/preferences-dialog.c:2570
+#: ../app/dialogs/preferences-dialog.c:2722
 msgid "Select Brush Folders"
 msgstr "�ลือ���ล��อร�หัว��ร�"
 
-#: ../app/dialogs/preferences-dialog.c:2572
+#: ../app/dialogs/preferences-dialog.c:2724
+#, fuzzy
+#| msgid "Font Folders"
+msgid "Dynamics Folders"
+msgstr "��ล��อร����อั�ษร"
+
+#: ../app/dialogs/preferences-dialog.c:2726
+#, fuzzy
+#| msgid "Select Font Folders"
+msgid "Select Dynamics Folders"
+msgstr "�ลือ���ล��อร����อั�ษร"
+
+#: ../app/dialogs/preferences-dialog.c:2728
 msgid "Pattern Folders"
 msgstr "��ล��อร����ลาย"
 
-#: ../app/dialogs/preferences-dialog.c:2574
+#: ../app/dialogs/preferences-dialog.c:2730
 msgid "Select Pattern Folders"
 msgstr "�ลือ���ล��อร����ลาย"
 
-#: ../app/dialogs/preferences-dialog.c:2576
+#: ../app/dialogs/preferences-dialog.c:2732
 msgid "Palette Folders"
 msgstr "��ล��อร��า�สี"
 
-#: ../app/dialogs/preferences-dialog.c:2578
+#: ../app/dialogs/preferences-dialog.c:2734
 msgid "Select Palette Folders"
 msgstr "�ลือ���ล��อร��า�สี"
 
-#: ../app/dialogs/preferences-dialog.c:2580
+#: ../app/dialogs/preferences-dialog.c:2736
 msgid "Gradient Folders"
 msgstr "��ล��อร�สี�ร��า"
 
-#: ../app/dialogs/preferences-dialog.c:2582
+#: ../app/dialogs/preferences-dialog.c:2738
 msgid "Select Gradient Folders"
 msgstr "�ลือ���ล��อร�สี�ร��า"
 
-#: ../app/dialogs/preferences-dialog.c:2584
+#: ../app/dialogs/preferences-dialog.c:2740
 msgid "Font Folders"
 msgstr "��ล��อร����อั�ษร"
 
-#: ../app/dialogs/preferences-dialog.c:2586
+#: ../app/dialogs/preferences-dialog.c:2742
 msgid "Select Font Folders"
 msgstr "�ลือ���ล��อร����อั�ษร"
 
-#: ../app/dialogs/preferences-dialog.c:2588
+#: ../app/dialogs/preferences-dialog.c:2744
 msgid "Plug-In Folders"
 msgstr "��ล��อร���ร��รม�สริม"
 
-#: ../app/dialogs/preferences-dialog.c:2590
+#: ../app/dialogs/preferences-dialog.c:2746
 msgid "Select Plug-In Folders"
 msgstr "�ลือ���ล��อร���ร��รม�สริม"
 
-#: ../app/dialogs/preferences-dialog.c:2592
+#: ../app/dialogs/preferences-dialog.c:2748
 msgid "Scripts"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2592
+#: ../app/dialogs/preferences-dialog.c:2748
 msgid "Script-Fu Folders"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2594
+#: ../app/dialogs/preferences-dialog.c:2750
 msgid "Select Script-Fu Folders"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2596
+#: ../app/dialogs/preferences-dialog.c:2752
 msgid "Module Folders"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2598
+#: ../app/dialogs/preferences-dialog.c:2754
 msgid "Select Module Folders"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2600
+#: ../app/dialogs/preferences-dialog.c:2756
 #, fuzzy
 msgid "Interpreters"
 msgstr "��ำ�ั�"
 
-#: ../app/dialogs/preferences-dialog.c:2600
+#: ../app/dialogs/preferences-dialog.c:2756
 #, fuzzy
 msgid "Interpreter Folders"
 msgstr "��ล��อร����ลาย"
 
-#: ../app/dialogs/preferences-dialog.c:2602
+#: ../app/dialogs/preferences-dialog.c:2758
 #, fuzzy
 msgid "Select Interpreter Folders"
 msgstr "�ลือ���ล��อร����ลาย"
 
-#: ../app/dialogs/preferences-dialog.c:2604
+#: ../app/dialogs/preferences-dialog.c:2760
 msgid "Environment Folders"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2606
+#: ../app/dialogs/preferences-dialog.c:2762
 msgid "Select Environment Folders"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2608
+#: ../app/dialogs/preferences-dialog.c:2764
 msgid "Themes"
 msgstr "�ุ�������"
 
-#: ../app/dialogs/preferences-dialog.c:2608
+#: ../app/dialogs/preferences-dialog.c:2764
 msgid "Theme Folders"
 msgstr "��ล��อร��ุ�������"
 
-#: ../app/dialogs/preferences-dialog.c:2610
+#: ../app/dialogs/preferences-dialog.c:2766
 msgid "Select Theme Folders"
 msgstr "�ลือ���ล��อร��ุ�������"
 
@@ -7735,60 +11486,60 @@ msgid "Print Size"
 msgstr "��า��ิม��"
 
 #. the image size labels
-#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:200
-#: ../app/widgets/gimptemplateeditor.c:161
+#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:201
+#: ../app/widgets/gimptemplateeditor.c:160
 msgid "_Width:"
 msgstr "_�ว�า�:"
 
-#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:204
-#: ../app/widgets/gimptemplateeditor.c:168
+#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:205
+#: ../app/widgets/gimptemplateeditor.c:167
 msgid "H_eight:"
 msgstr "_สู�:"
 
 #. the resolution labels
-#: ../app/dialogs/print-size-dialog.c:220 ../app/widgets/gimpsizebox.c:263
-#: ../app/widgets/gimptemplateeditor.c:288
+#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:263
+#: ../app/widgets/gimptemplateeditor.c:287
 msgid "_X resolution:"
 msgstr "�วามละ�อีย���ว_�อ�:"
 
-#: ../app/dialogs/print-size-dialog.c:227 ../app/widgets/gimpsizebox.c:266
-#: ../app/widgets/gimptemplateeditor.c:295
+#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:266
+#: ../app/widgets/gimptemplateeditor.c:294
 msgid "_Y resolution:"
 msgstr "�วามละ�อีย���ว_�ั��:"
 
-#: ../app/dialogs/print-size-dialog.c:238 ../app/widgets/gimpsizebox.c:259
-#: ../app/widgets/gimptemplateeditor.c:308
+#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:259
+#: ../app/widgets/gimptemplateeditor.c:307
 #, c-format
 msgid "pixels/%a"
 msgstr "�ุ�ภา�/%a"
 
-#: ../app/dialogs/quit-dialog.c:106
+#: ../app/dialogs/quit-dialog.c:104
 #, fuzzy
 msgid "Quit GIMP"
 msgstr "ออ��า� GIMP"
 
-#: ../app/dialogs/quit-dialog.c:106
+#: ../app/dialogs/quit-dialog.c:104
 #, fuzzy
 msgid "Close All Images"
 msgstr "�ิ��ุ�สำรั��า�"
 
-#: ../app/dialogs/quit-dialog.c:165
+#: ../app/dialogs/quit-dialog.c:163
 msgid "If you quit GIMP now, these changes will be lost."
 msgstr "หา��ุ�ออ��า� GIMP �อ��ี� �ุ��ะสู��สีย�าร�ระ�ำ�ั��หม�"
 
-#: ../app/dialogs/quit-dialog.c:168
+#: ../app/dialogs/quit-dialog.c:166
 #, fuzzy
 msgid "If you close these images now, changes will be lost."
 msgstr "หา���า��ม��ำ�าร�ั��ึ�ภา� �าร�ระ�ำ��า�� ภาย�� %s �ะหาย��"
 
-#: ../app/dialogs/quit-dialog.c:216
+#: ../app/dialogs/quit-dialog.c:213
 #, fuzzy, c-format
 msgid "There is one image with unsaved changes:"
 msgid_plural "There are %d images with unsaved changes:"
 msgstr[0] "มีห�ึ��ภา�ยั��ม�����ำ�าร�ั��ึ�:"
 msgstr[1] "มีห�ึ��ภา�ยั��ม�����ำ�าร�ั��ึ�:"
 
-#: ../app/dialogs/quit-dialog.c:238
+#: ../app/dialogs/quit-dialog.c:235
 msgid "_Discard Changes"
 msgstr ""
 
@@ -7796,16 +11547,16 @@ msgstr ""
 msgid "Canvas Size"
 msgstr "��า�ห��า�ระ�าษ"
 
-#: ../app/dialogs/resize-dialog.c:130 ../app/dialogs/scale-dialog.c:110
+#: ../app/dialogs/resize-dialog.c:130 ../app/dialogs/scale-dialog.c:109
 msgid "Layer Size"
 msgstr "��า��ั���า�"
 
-#: ../app/dialogs/resize-dialog.c:293
+#: ../app/dialogs/resize-dialog.c:295
 #, fuzzy
 msgid "Resize _layers:"
 msgstr "�รั���า��ั���า�"
 
-#: ../app/dialogs/resolution-calibrate-dialog.c:70
+#: ../app/dialogs/resolution-calibrate-dialog.c:69
 msgid "Calibrate Monitor Resolution"
 msgstr "�รั�มา�ร�า��วามละ�อีย��อภา�"
 
@@ -7822,229 +11573,299 @@ msgid "_Vertical:"
 msgstr ""
 
 #. Image size frame
-#: ../app/dialogs/scale-dialog.c:99 ../app/widgets/gimptemplateeditor.c:139
+#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:138
 msgid "Image Size"
 msgstr "��า�ภา�"
 
-#: ../app/dialogs/scale-dialog.c:175
+#: ../app/dialogs/scale-dialog.c:176
 msgid "Quality"
 msgstr "�ุ�ภา�"
 
-#: ../app/dialogs/scale-dialog.c:187
+#: ../app/dialogs/scale-dialog.c:188
 msgid "I_nterpolation:"
 msgstr ""
 
-#: ../app/dialogs/scale-dialog.c:206
+#: ../app/dialogs/scale-dialog.c:207
+#, fuzzy
+#| msgid ""
+#| "Indexed color layers are always scaled without interpolation. The chosen "
+#| "interpolation type will affect channels and masks only."
 msgid ""
 "Indexed color layers are always scaled without interpolation. The chosen "
-"interpolation type will affect channels and masks only."
+"interpolation type will affect channels and layer masks only."
 msgstr ""
 "�าร�รั�สั�ส�ว��ั���า����สี Indexed �ะ�ม����วิ�ี�าร�ระมา���า "
 "รู����วิ�ี�าร�ระมา���า�ะมี�ล�ั������ล�ละห��า�า����า�ั��"
 
-#: ../app/dialogs/stroke-dialog.c:102
+#: ../app/dialogs/stroke-dialog.c:97
 msgid "Choose Stroke Style"
 msgstr "�ลือ�ลั�ษ�ะ�าร�ี�ส��"
 
-#: ../app/dialogs/stroke-dialog.c:214
+#: ../app/dialogs/stroke-dialog.c:222
 #, fuzzy
 msgid "Paint tool:"
 msgstr "��รื�อ�มือ�าสี"
 
+#: ../app/dialogs/stroke-dialog.c:236
+msgid "_Emulate brush dynamics"
+msgstr ""
+
 #: ../app/dialogs/tips-dialog.c:88
-msgid "<b>Your GIMP tips file appears to be missing!</b>"
+msgid "The GIMP tips file is empty!"
 msgstr ""
 
-#: ../app/dialogs/tips-dialog.c:90
+#: ../app/dialogs/tips-dialog.c:92
+#, fuzzy
+#| msgid ""
+#| "The GIMP help browser plug-in appears to be missing from your "
+#| "installation."
+msgid "The GIMP tips file appears to be missing!"
+msgstr "��ร��รม�สริม�ัว�รีย��ู�าร��วย�หลือ�อ� GIMP สู�หาย�า��าร�ิ��ั��"
+
+#: ../app/dialogs/tips-dialog.c:94
 #, c-format
 msgid "There should be a file called '%s'. Please check your installation."
 msgstr "�วรมี���ม�ื�อ '%s' อยู���ระ�� �รุ�า�รว�สอ��าร�ิ��ั����ร��รม"
 
-#: ../app/dialogs/tips-dialog.c:96
-msgid "<b>The GIMP tips file could not be parsed!</b>"
+#: ../app/dialogs/tips-dialog.c:100
+msgid "The GIMP tips file could not be parsed!"
 msgstr ""
 
-#: ../app/dialogs/tips-dialog.c:129
+#: ../app/dialogs/tips-dialog.c:128
 msgid "GIMP Tip of the Day"
 msgstr ""
 
-#: ../app/dialogs/tips-dialog.c:181
-msgid "Show tip next time GIMP starts"
-msgstr "�ส���ำ��ะ�ำ�าร��� GIMP �มื�อ��ิ���ร��รม�รั����อ��"
-
-#: ../app/dialogs/tips-dialog.c:205
+#: ../app/dialogs/tips-dialog.c:134
 #, fuzzy
 msgid "_Previous Tip"
 msgstr "_��า��าร�ส���ัวอย�า�"
 
-#: ../app/dialogs/tips-dialog.c:214
+#: ../app/dialogs/tips-dialog.c:140
 msgid "_Next Tip"
 msgstr ""
 
+#. a link to the related section in the user manual
+#: ../app/dialogs/tips-dialog.c:193
+msgid "Learn more"
+msgstr ""
+
 #. This is a special string to specify the language identifier to
 #. look for in the gimp-tips.xml file. Please translate the C in it
 #. according to the name of the po file used for gimp-tips.xml.
 #. E.g. for the german translation, that would be "tips-locale:de".
 #.
-#: ../app/dialogs/tips-parser.c:165
+#: ../app/dialogs/tips-parser.c:187
 msgid "tips-locale:C"
 msgstr ""
 
-#: ../app/dialogs/user-install-dialog.c:85
+#: ../app/dialogs/user-install-dialog.c:84
 msgid "GIMP User Installation"
 msgstr "�าร�ิ��ั�� GIMP �อ��ู����"
 
-#: ../app/dialogs/user-install-dialog.c:94
+#: ../app/dialogs/user-install-dialog.c:93
 #, fuzzy
 msgid "User installation failed!"
 msgstr "�าร�ิ��ั�� GIMP �อ��ู����"
 
-#: ../app/dialogs/user-install-dialog.c:96
+#: ../app/dialogs/user-install-dialog.c:95
 msgid "The GIMP user installation failed; see the log for details."
 msgstr ""
 
-#: ../app/dialogs/user-install-dialog.c:99
+#: ../app/dialogs/user-install-dialog.c:98
 #, fuzzy
 msgid "Installation Log"
 msgstr "�าร�ิ��ั�� GIMP �อ��ู����"
 
-#: ../app/dialogs/vectors-export-dialog.c:53
+#: ../app/dialogs/vectors-export-dialog.c:55
 msgid "Export Path to SVG"
 msgstr "ส����อมูล�ส���า�ออ����� SVG"
 
-#: ../app/dialogs/vectors-export-dialog.c:83
+#: ../app/dialogs/vectors-export-dialog.c:90
 msgid "Export the active path"
 msgstr "ส��ออ���อมูล�ส���า��ี��ลือ�อยู�"
 
-#: ../app/dialogs/vectors-export-dialog.c:84
+#: ../app/dialogs/vectors-export-dialog.c:91
 msgid "Export all paths from this image"
 msgstr "ส��ออ���อมูล�ส���า���รู��ั��หม�"
 
-#: ../app/dialogs/vectors-import-dialog.c:57
+#: ../app/dialogs/vectors-import-dialog.c:58
 msgid "Import Paths from SVG"
 msgstr "�ำ���า�ส���า��า� SVG"
 
-#: ../app/dialogs/vectors-import-dialog.c:88
+#: ../app/dialogs/vectors-import-dialog.c:92
+#: ../app/widgets/gimpprofilechooserdialog.c:131
 #, fuzzy
 msgid "All files (*.*)"
 msgstr "���ม�ั��หม� (*.*)"
 
-#: ../app/dialogs/vectors-import-dialog.c:93
+#: ../app/dialogs/vectors-import-dialog.c:97
 msgid "Scalable SVG image (*.svg)"
 msgstr ""
 
-#: ../app/dialogs/vectors-import-dialog.c:104
+#: ../app/dialogs/vectors-import-dialog.c:108
 msgid "_Merge imported paths"
 msgstr "_�สา��ส���า��ี��ำ���า"
 
-#: ../app/dialogs/vectors-import-dialog.c:114
+#: ../app/dialogs/vectors-import-dialog.c:118
 msgid "_Scale imported paths to fit image"
 msgstr ""
 
-#: ../app/dialogs/vectors-options-dialog.c:121
+#: ../app/dialogs/vectors-options-dialog.c:122
 #, fuzzy
 msgid "Path name:"
 msgstr "�ื�อ�ส���า�"
 
-#: ../app/display/display-enums.c:24
-msgid "Tool icon"
-msgstr "�อ�อ���รื�อ�มือ"
+#: ../app/display/gimpcursorview.c:210 ../app/display/gimpcursorview.c:216
+#: ../app/display/gimpcursorview.c:235 ../app/display/gimpcursorview.c:241
+#: ../app/display/gimpcursorview.c:260 ../app/display/gimpcursorview.c:266
+#: ../app/display/gimpcursorview.c:282 ../app/display/gimpcursorview.c:289
+#: ../app/display/gimpcursorview.c:664 ../app/display/gimpcursorview.c:665
+#: ../app/display/gimpcursorview.c:666 ../app/display/gimpcursorview.c:667
+#: ../app/display/gimpcursorview.c:780 ../app/display/gimpcursorview.c:781
+#: ../app/display/gimpcursorview.c:782 ../app/display/gimpcursorview.c:783
+#: ../app/widgets/gimpcolorframe.c:630
+msgid "n/a"
+msgstr ""
 
-#: ../app/display/display-enums.c:25
-msgid "Tool icon with crosshair"
+#: ../app/display/gimpcursorview.c:213 ../app/display/gimpcursorview.c:238
+#: ../app/display/gimpcursorview.c:263
+#: ../app/widgets/gimpdeviceinfoeditor.c:140
+msgid "X"
 msgstr ""
 
-#: ../app/display/display-enums.c:26
-msgid "Crosshair only"
+#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244
+#: ../app/display/gimpcursorview.c:269
+#: ../app/widgets/gimpdeviceinfoeditor.c:141
+msgid "Y"
 msgstr ""
 
-#: ../app/display/display-enums.c:55
-msgid "From theme"
-msgstr "�า��ุ�������"
+#. Units
+#: ../app/display/gimpcursorview.c:225
+msgid "Units"
+msgstr "ห��วย"
 
-#: ../app/display/display-enums.c:56
-msgid "Light check color"
-msgstr "สีอ�อ�"
+#. Selection Bounding Box
+#: ../app/display/gimpcursorview.c:250
+#, fuzzy
+#| msgid "Selection Editor"
+msgid "Selection Bounding Box"
+msgstr "��รื�อ�มือ������ื���ี��ลือ�"
 
-#: ../app/display/display-enums.c:57
-msgid "Dark check color"
-msgstr "สี���ม"
+#. Width
+#: ../app/display/gimpcursorview.c:286
+msgid "W"
+msgstr ""
 
-#: ../app/display/display-enums.c:58
-msgid "Custom color"
-msgstr "�ลือ�สี�อ�"
+#. Height
+#: ../app/display/gimpcursorview.c:293
+msgid "H"
+msgstr ""
 
-#: ../app/display/display-enums.c:86
-#, fuzzy
-msgid "No action"
-msgstr "�ม�มี�าร�ลือ�"
+#: ../app/display/gimpcursorview.c:320
+msgid "_Sample Merged"
+msgstr "_ภา�รวม"
 
-#: ../app/display/display-enums.c:87
+#: ../app/display/gimpdisplayshell.c:500
 #, fuzzy
-msgid "Pan view"
-msgstr "�ส���ัวอย�า�"
-
-#: ../app/display/display-enums.c:88
-msgid "Switch to Move tool"
-msgstr ""
+msgid "Access the image menu"
+msgstr "�รั���า�า�ุสี�ละ�วามอิ�มสี"
 
-#: ../app/display/gimpdisplayshell.c:948
+#: ../app/display/gimpdisplayshell.c:614
 msgid "Zoom image when window size changes"
 msgstr "ย�อ-�ยายภา��มื�อ��า��อ�ห��า��า���ลี�ย�"
 
-#: ../app/display/gimpdisplayshell-close.c:125
-#: ../app/display/gimpdisplayshell-close.c:202
+#: ../app/display/gimpdisplayshell.c:643
+msgid "Toggle Quick Mask"
+msgstr "สลั�ห��า�า���ว�"
+
+#: ../app/display/gimpdisplayshell.c:666
+#, fuzzy
+msgid "Navigate the image display"
+msgstr "สลั�ห��า�อภา��ี��ั��มา"
+
+#: ../app/display/gimpdisplayshell.c:734
+#: ../app/display/gimpdisplayshell.c:1319 ../app/widgets/gimptoolbox.c:315
+msgid "Drop image files here to open them"
+msgstr ""
+
+#: ../app/display/gimpdisplayshell-close.c:153
+#: ../app/display/gimpdisplayshell-close.c:223
 #, c-format
 msgid "Close %s"
 msgstr "�ิ� %s"
 
-#: ../app/display/gimpdisplayshell-close.c:137
-#, fuzzy
-msgid "Do_n't Save"
-msgstr "�_ม��ั��ึ�"
+#: ../app/display/gimpdisplayshell-close.c:164
+msgid "Close _without Saving"
+msgstr ""
 
-#: ../app/display/gimpdisplayshell-close.c:209
+#: ../app/display/gimpdisplayshell-close.c:231
 #, c-format
 msgid "Save the changes to image '%s' before closing?"
 msgstr "�ั��ึ��าร�ระ�ำ��า�� ��อภา� %s ��อ��ิ�หรือ�ม�"
 
-#: ../app/display/gimpdisplayshell-close.c:231
+#: ../app/display/gimpdisplayshell-close.c:254
 #, fuzzy, c-format
-msgid ""
-"If you don't save the image, changes from the last %s and %s will be lost."
-msgstr "หา���า��ม��ำ�าร�ั��ึ�ภา� �าร�ระ�ำ��า�� ภาย�� %s �ะหาย��"
-
-#: ../app/display/gimpdisplayshell-close.c:237
-#, c-format
-msgid "If you don't save the image, changes from the last %s will be lost."
-msgstr "หา���า��ม��ำ�าร�ั��ึ�ภา� �าร�ระ�ำ��า�� ภาย�� %s �ะหาย��"
+#| msgid "If you don't save the image, changes from the last %s will be lost."
+msgid "If you don't save the image, changes from the last hour will be lost."
+msgid_plural ""
+"If you don't save the image, changes from the last %d hours will be lost."
+msgstr[0] "หา���า��ม��ำ�าร�ั��ึ�ภา� �าร�ระ�ำ��า�� ภาย�� %s �ะหาย��"
+msgstr[1] "หา���า��ม��ำ�าร�ั��ึ�ภา� �าร�ระ�ำ��า�� ภาย�� %s �ะหาย��"
 
-#: ../app/display/gimpdisplayshell-close.c:310
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+#: ../app/display/gimpdisplayshell-close.c:264
+#, fuzzy, c-format
+msgid ""
+"If you don't save the image, changes from the last hour and %d minute will "
+"be lost."
+msgid_plural ""
+"If you don't save the image, changes from the last hour and %d minutes will "
+"be lost."
+msgstr[0] "หา���า��ม��ำ�าร�ั��ึ�ภา� �าร�ระ�ำ��า�� ภาย�� %s �ะหาย��"
+msgstr[1] "หา���า��ม��ำ�าร�ั��ึ�ภา� �าร�ระ�ำ��า�� ภาย�� %s �ะหาย��"
 
-#: ../app/display/gimpdisplayshell-close.c:316
+#: ../app/display/gimpdisplayshell-close.c:275
 #, fuzzy, c-format
-msgid "minute"
-msgid_plural "%d minutes"
-msgstr[0] "�า�ี"
-msgstr[1] "�า�ี"
-
-#: ../app/display/gimpdisplayshell-dnd.c:200
-#: ../app/display/gimpdisplayshell-dnd.c:503
-#: ../app/display/gimpdisplayshell-dnd.c:556
+#| msgid "If you don't save the image, changes from the last %s will be lost."
+msgid "If you don't save the image, changes from the last minute will be lost."
+msgid_plural ""
+"If you don't save the image, changes from the last %d minutes will be lost."
+msgstr[0] "หา���า��ม��ำ�าร�ั��ึ�ภา� �าร�ระ�ำ��า�� ภาย�� %s �ะหาย��"
+msgstr[1] "หา���า��ม��ำ�าร�ั��ึ�ภา� �าร�ระ�ำ��า�� ภาย�� %s �ะหาย��"
+
+#: ../app/display/gimpdisplayshell-dnd.c:232
+#: ../app/display/gimpdisplayshell-dnd.c:602
+#: ../app/display/gimpdisplayshell-dnd.c:667
 msgid "Drop New Layer"
 msgstr ""
 
-#: ../app/display/gimpdisplayshell-dnd.c:246
+#: ../app/display/gimpdisplayshell-dnd.c:275
 msgid "Drop New Path"
 msgstr ""
 
-#: ../app/display/gimpdisplayshell-dnd.c:544
-#: ../app/widgets/gimplayertreeview.c:833 ../app/widgets/gimptoolbox-dnd.c:357
+#: ../app/display/gimpdisplayshell-dnd.c:347
+#: ../app/display/gimpdisplayshell-dnd.c:442 ../app/tools/gimpblendtool.c:174
+#: ../app/tools/gimpbucketfilltool.c:135 ../app/tools/gimpimagemaptool.c:279
+msgid "Cannot modify the pixels of layer groups."
+msgstr ""
+
+#: ../app/display/gimpdisplayshell-dnd.c:355
+#: ../app/display/gimpdisplayshell-dnd.c:450 ../app/tools/gimpblendtool.c:181
+#: ../app/tools/gimpbucketfilltool.c:142 ../app/tools/gimpcroptool.c:335
+#: ../app/tools/gimpimagemaptool.c:286 ../app/tools/gimppainttool.c:286
+#: ../app/tools/gimptransformtool.c:349 ../app/tools/gimptransformtool.c:1193
+msgid "The active layer's pixels are locked."
+msgstr ""
+
+#: ../app/display/gimpdisplayshell-dnd.c:512
+#: ../app/widgets/gimplayertreeview.c:751
+#, fuzzy
+#| msgid "Crop Layer"
+msgid "Drop layers"
+msgstr "�ั��รอ��ั���า�"
+
+#: ../app/display/gimpdisplayshell-dnd.c:635
+#: ../app/display/gimpdisplayshell-dnd.c:657
+#: ../app/widgets/gimplayertreeview.c:828 ../app/widgets/gimptoolbox-dnd.c:274
 #, fuzzy
 msgid "Dropped Buffer"
 msgstr "_ล��ุ��ั���อมูล"
@@ -8057,329 +11878,683 @@ msgstr "ห��า��า��ัว�รอ�สี"
 msgid "Configure Color Display Filters"
 msgstr "�รั����ห��า��า��ัว�รอ�สี"
 
-#: ../app/display/gimpdisplayshell-layer-select.c:122
+#: ../app/display/gimpdisplayshell-handlers.c:605
+#, c-format
+msgid "Image saved to '%s'"
+msgstr ""
+
+#: ../app/display/gimpdisplayshell-handlers.c:619
+#, c-format
+msgid "Image exported to '%s'"
+msgstr ""
+
+#: ../app/display/gimpdisplayshell-layer-select.c:120
 msgid "Layer Select"
 msgstr ""
 
-#: ../app/display/gimpdisplayshell-scale.c:480
+#: ../app/display/gimpdisplayshell-scale-dialog.c:114
 msgid "Zoom Ratio"
 msgstr "อั�ราย�อ-�ยาย"
 
-#: ../app/display/gimpdisplayshell-scale.c:482
+#: ../app/display/gimpdisplayshell-scale-dialog.c:116
 msgid "Select Zoom Ratio"
 msgstr "�ลือ�อั�ราย�อ-�ยาย"
 
-#: ../app/display/gimpdisplayshell-scale.c:525
+#: ../app/display/gimpdisplayshell-scale-dialog.c:161
 #, fuzzy
 msgid "Zoom ratio:"
 msgstr "อั�ราย�อ-�ยาย:"
 
-#: ../app/display/gimpdisplayshell-scale.c:550
+#: ../app/display/gimpdisplayshell-scale-dialog.c:186
 msgid "Zoom:"
 msgstr "ย�อ-�ยาย:"
 
-#: ../app/display/gimpdisplayshell-title.c:226
-msgid "RGB-empty"
-msgstr "RGB-ว�า�"
-
-#: ../app/display/gimpdisplayshell-title.c:229
-msgid "grayscale-empty"
-msgstr "grayscale-ว�า�"
-
-#: ../app/display/gimpdisplayshell-title.c:229
-msgid "grayscale"
-msgstr "grayscale"
-
-#: ../app/display/gimpdisplayshell-title.c:232
-msgid "indexed-empty"
-msgstr "indexed-ว�า�"
-
-#: ../app/display/gimpdisplayshell-title.c:232
-msgid "indexed"
-msgstr "indexed"
-
-#: ../app/display/gimpdisplayshell-title.c:286
+#: ../app/display/gimpdisplayshell-title.c:303
 msgid "(modified)"
 msgstr "(������ล�ว)"
 
-#: ../app/display/gimpdisplayshell-title.c:291
+#: ../app/display/gimpdisplayshell-title.c:308
 msgid "(clean)"
 msgstr "(ล�ล�า�)"
 
-#: ../app/display/gimpdisplayshell-title.c:330
-#: ../app/display/gimpdisplayshell-title.c:342
-#: ../app/widgets/gimpactiongroup.c:782
+#: ../app/display/gimpdisplayshell-title.c:356
+#: ../app/display/gimpdisplayshell-title.c:369
+#: ../app/widgets/gimpactiongroup.c:848
 msgid "(none)"
 msgstr ""
 
-#: ../app/display/gimpstatusbar.c:115
-msgid "Shadow type"
-msgstr "�ระ�ภ���า"
-
-#: ../app/display/gimpstatusbar.c:116
-msgid "Style of bevel around the statusbar text"
-msgstr "รู�����ารย��อ�รอ�� ���ส�า�ะ��อ�วาม"
+#: ../app/display/gimpdisplayshell-title.c:500
+msgid " (exported)"
+msgstr ""
 
-#: ../app/display/gimpstatusbar.c:224
-msgid "Cancel"
-msgstr "ย��ลิ�"
+#: ../app/display/gimpdisplayshell-title.c:502
+msgid " (overwritten)"
+msgstr ""
 
-#: ../app/display/gimpstatusbar.c:444
+#: ../app/display/gimpdisplayshell-title.c:508
 #, fuzzy
-msgid "Other..."
-msgstr "_อื���"
+#| msgid "New import"
+msgid " (imported)"
+msgstr "�ำ���า�หม�"
+
+#: ../app/display/gimpstatusbar.c:361
+#, c-format
+msgid "Cancel <i>%s</i>"
+msgstr ""
 
-#: ../app/file/file-open.c:118 ../app/file/file-save.c:112
+#: ../app/file/file-open.c:136 ../app/file/file-save.c:112
 msgid "Not a regular file"
 msgstr "�ม�������ม�ั�ว��"
 
-#: ../app/file/file-open.c:163
-msgid "Plug-In returned SUCCESS but did not return an image"
+#: ../app/file/file-open.c:188
+#, c-format
+msgid "%s plug-in returned SUCCESS but did not return an image"
 msgstr ""
 
-#: ../app/file/file-open.c:171
-msgid "Plug-In could not open image"
+#: ../app/file/file-open.c:199
+#, fuzzy, c-format
+#| msgid "Plug-In could not open image"
+msgid "%s plug-In could not open image"
 msgstr "��ร��รม�สริม�ม�สามาร���ิ�ภา����"
 
-#: ../app/file/file-open.c:413
-msgid "Image doesn't contain any visible layers"
+#: ../app/file/file-open.c:518
+#, fuzzy
+#| msgid "Image doesn't contain any visible layers"
+msgid "Image doesn't contain any layers"
 msgstr "ภา��ม�มีส�ว��อ��ั���า��ี�มอ��ห������ส��อยู�"
 
-#: ../app/file/file-save.c:189
-msgid "Plug-In could not save image"
-msgstr "��ร��รม�สริม�ม�สามาร��ั��ึ�ภา����"
+#: ../app/file/file-open.c:571
+#, c-format
+msgid "Opening '%s' failed: %s"
+msgstr "�าร��ิ� '%s' ล�ม�หลว: %s"
 
-#: ../app/file/file-utils.c:116
-msgid "Invalid character sequence in URI"
+#: ../app/file/file-open.c:678
+msgid ""
+"Color management has been disabled. It can be enabled again in the "
+"Preferences dialog."
 msgstr ""
 
-#: ../app/file/file-utils.c:287
+#: ../app/file/file-procedure.c:198
 msgid "Unknown file type"
 msgstr "�ม�รู��ั��ระ�ภ��อ����ม"
 
-#: ../app/gui/splash.c:114
-msgid "GIMP Startup"
-msgstr "�ริ�ม�าร�ำ�า� GIMP"
+#: ../app/file/file-save.c:189
+#, fuzzy, c-format
+#| msgid "Plug-In could not save image"
+msgid "%s plug-in could not save image"
+msgstr "��ร��รม�สริม�ม�สามาร��ั��ึ�ภา����"
 
-#: ../app/gui/themes.c:231 ../app/plug-in/gimppluginmanager.c:485
+#: ../app/file/file-utils.c:74
 #, c-format
-msgid "Writing '%s'\n"
-msgstr "�ำลั���ีย� '%s'\n"
+msgid "'%s:' is not a valid URI scheme"
+msgstr ""
 
-#: ../app/gui/themes.c:284
-#, c-format
-msgid "Adding theme '%s' (%s)\n"
-msgstr "�ำลั���ิ�ม�ุ������� '%s' (%s)\n"
+#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126
+msgid "Invalid character sequence in URI"
+msgstr ""
+
+#: ../app/gegl/gimpcurvesconfig.c:384
+#, fuzzy
+msgid "not a GIMP Curves file"
+msgstr "�ม�������ม�ั�ว��"
+
+#: ../app/gegl/gimpcurvesconfig.c:399 ../app/gegl/gimplevelsconfig.c:710
+#, fuzzy
+msgid "parse error"
+msgstr "��อ�ิ��ลา���"
+
+#: ../app/gegl/gimplevelsconfig.c:663
+#, fuzzy
+msgid "not a GIMP Levels file"
+msgstr "�ม�������ม�ั�ว��"
+
+#. initialize the document history
+#: ../app/gui/gui.c:427
+msgid "Documents"
+msgstr "�ิ���า���า��"
+
+#: ../app/gui/splash.c:115
+msgid "GIMP Startup"
+msgstr "�ริ�ม�าร�ำ�า� GIMP"
 
-#: ../app/paint/gimpairbrush.c:69 ../app/tools/gimpairbrushtool.c:54
+#: ../app/paint/gimpairbrush.c:72 ../app/tools/gimpairbrushtool.c:53
 msgid "Airbrush"
 msgstr "�ู��ั�ลม"
 
-#: ../app/paint/gimpbrushcore.c:341
+#: ../app/paint/gimpbrushcore.c:435
 msgid "No brushes available for use with this tool."
 msgstr "�ม�มีหัว��ร��ี�สามาร��������ั���รื�อ�มือ�ี�"
 
-#: ../app/paint/gimpclone.c:100 ../app/tools/gimpclonetool.c:61
+#: ../app/paint/gimpbrushcore.c:442
+#, fuzzy
+msgid "No paint dynamics available for use with this tool."
+msgstr "�ม�มีหัว��ร��ี�สามาร��������ั���รื�อ�มือ�ี�"
+
+#: ../app/paint/gimpclone.c:102 ../app/tools/gimpclonetool.c:60
 msgid "Clone"
 msgstr "ลอ����"
 
-#: ../app/paint/gimpclone.c:141
+#: ../app/paint/gimpclone.c:143
 #, fuzzy
 msgid "No patterns available for use with this tool."
 msgstr "�ม�มีหัว��ร��ี�สามาร��������ั���รื�อ�มือ�ี�"
 
-#: ../app/paint/gimpconvolve.c:121
+#: ../app/paint/gimpconvolve.c:80
 msgid "Convolve"
 msgstr "หย���ำ"
 
-#: ../app/paint/gimpdodgeburn.c:87
+#: ../app/paint/gimpdodgeburn.c:91
 msgid "Dodge/Burn"
 msgstr ""
 
-#: ../app/paint/gimpheal.c:86 ../app/tools/gimphealtool.c:57
+#: ../app/paint/gimperaser.c:65 ../app/tools/gimperasertool.c:65
+msgid "Eraser"
+msgstr "ยา�ล�"
+
+#: ../app/paint/gimpheal.c:118 ../app/tools/gimphealtool.c:52
 #, fuzzy
 msgid "Heal"
 msgstr "��วย�หลือ"
 
-#: ../app/paint/gimpheal.c:125
+#: ../app/paint/gimpheal.c:157
 #, fuzzy
 msgid "Healing does not operate on indexed layers."
 msgstr "�าร��ลี�ย�ห����า�ั��ม�สามาร��������ั��ั���า�����ั��ีสี"
 
-#: ../app/paint/gimperaser.c:62 ../app/tools/gimperasertool.c:66
-msgid "Eraser"
-msgstr "ยา�ล�"
+#: ../app/paint/gimpink.c:97 ../app/tools/gimpinktool.c:54
+msgid "Ink"
+msgstr "หมึ�"
+
+#: ../app/paint/gimpinkoptions.c:72
+msgid "Ink Blob Size"
+msgstr ""
+
+#: ../app/paint/gimpinkoptions.c:99
+#, fuzzy
+#| msgid "Aspect ratio:"
+msgid "Ink Blob Aspect Ratio"
+msgstr "สั�ส�ว�:"
 
-#: ../app/paint/gimppaintbrush.c:63 ../app/tools/gimppaintbrushtool.c:51
+#: ../app/paint/gimpinkoptions.c:103
+msgid "Ink Blob Angle"
+msgstr ""
+
+#: ../app/paint/gimppaintbrush.c:65 ../app/tools/gimppaintbrushtool.c:50
 msgid "Paintbrush"
 msgstr "�ู��ั�"
 
-#: ../app/paint/gimppencil.c:42 ../app/tools/gimppenciltool.c:51
+#: ../app/paint/gimppaintcore-stroke.c:335
+#, fuzzy
+#| msgid "No selection to stroke."
+msgid "Not enough points to stroke"
+msgstr "�ม�มี�าร�ลือ��ื���ี����าร�ี�ส��"
+
+#: ../app/paint/gimppaintcore.c:140
+msgid "Paint"
+msgstr "�าสี"
+
+#: ../app/paint/gimppaintoptions.c:136
+#, fuzzy
+#| msgid "Brushes"
+msgid "Brush Scale"
+msgstr "หัว��ร�"
+
+#: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:50
 msgid "Pencil"
 msgstr "�ิ�สอ"
 
-#: ../app/paint/gimpsmudge.c:78 ../app/tools/gimpsmudgetool.c:54
+#: ../app/paint/gimpperspectiveclone.c:98
+#: ../app/tools/gimpperspectiveclonetool.c:127
+msgid "Perspective Clone"
+msgstr ""
+
+#: ../app/paint/gimpperspectiveclone.c:163
+#, fuzzy
+msgid "Perspective Clone does not operate on indexed layers."
+msgstr "�าร�ลั���าสี�ม�สามาร�����า�������ั���า�����ั��ีสี"
+
+#: ../app/paint/gimpsmudge.c:83 ../app/tools/gimpsmudgetool.c:52
 msgid "Smudge"
 msgstr "�ู"
 
-#: ../app/paint/paint-enums.c:51
-msgid "Modify Perspective Plane"
+#: ../app/paint/gimpsourcecore.c:232
+msgid "Set a source image first."
 msgstr ""
 
 #: ../app/paint/paint-enums.c:52
+msgctxt "perspective-clone-mode"
+msgid "Modify Perspective"
+msgstr ""
+
+#: ../app/paint/paint-enums.c:53
+msgctxt "perspective-clone-mode"
 msgid "Perspective Clone"
 msgstr ""
 
-#: ../app/paint/paint-enums.c:82
+#: ../app/paint/paint-enums.c:83
+#, fuzzy
+#| msgid "None"
+msgctxt "source-align-mode"
+msgid "None"
+msgstr "�ม�มี"
+
+#: ../app/paint/paint-enums.c:84
+#, fuzzy
+#| msgid "Aligned"
+msgctxt "source-align-mode"
 msgid "Aligned"
 msgstr "�ั��รีย��ล�ว"
 
-#: ../app/paint/paint-enums.c:83
+#: ../app/paint/paint-enums.c:85
+#, fuzzy
+#| msgid "Registered"
+msgctxt "source-align-mode"
 msgid "Registered"
 msgstr "ล��ะ��ีย��ล�ว"
 
-#: ../app/paint/paint-enums.c:84
+#: ../app/paint/paint-enums.c:86
 #, fuzzy
+msgctxt "source-align-mode"
 msgid "Fixed"
 msgstr "���ม"
 
-#: ../app/paint/paint-enums.c:111
+#: ../app/paint/paint-enums.c:114
+#, fuzzy
+#| msgid "Blur"
+msgctxt "convolve-type"
 msgid "Blur"
 msgstr "มัว"
 
-#: ../app/paint/paint-enums.c:112
+#: ../app/paint/paint-enums.c:115
+#, fuzzy
+#| msgid "Sharpen"
+msgctxt "convolve-type"
 msgid "Sharpen"
 msgstr "�ำ�ห��ม"
 
-#: ../app/pdb/channel_cmds.c:173
+#: ../app/pdb/channel-cmds.c:182
 #, fuzzy
 msgid "Combine Masks"
 msgstr "ร_วม�ั�"
 
-#: ../app/pdb/color_cmds.c:100 ../app/tools/gimpbrightnesscontrasttool.c:100
-msgid "Brightness-Contrast"
-msgstr ""
-
-#: ../app/pdb/color_cmds.c:247 ../app/tools/gimpposterizetool.c:77
-msgid "Posterize"
-msgstr ""
-
-#: ../app/pdb/color_cmds.c:437 ../app/pdb/color_cmds.c:514
-#: ../app/tools/gimpcurvestool.c:148
-msgid "Curves"
-msgstr ""
-
-#: ../app/pdb/color_cmds.c:579 ../app/tools/gimpcolorbalancetool.c:94
-msgid "Color Balance"
-msgstr "สม�ุลสี"
-
-#: ../app/pdb/color_cmds.c:638 ../app/tools/gimpcolorizetool.c:92
-msgid "Colorize"
-msgstr "ย�อมสี"
-
-#: ../app/pdb/color_cmds.c:771 ../app/tools/gimphuesaturationtool.c:113
-msgid "Hue-Saturation"
-msgstr "�า�ุสี-�วามอิ�มสี"
-
-#: ../app/pdb/color_cmds.c:825 ../app/tools/gimpthresholdtool.c:82
-msgid "Threshold"
-msgstr ""
+#: ../app/pdb/drawable-cmds.c:941
+msgid "Plug-In"
+msgstr "��ร��รม�สริม"
 
-#: ../app/pdb/drawable_transform_cmds.c:304
-#: ../app/pdb/drawable_transform_cmds.c:388
-#: ../app/pdb/transform_tools_cmds.c:140 ../app/tools/gimpperspectivetool.c:68
-#: ../app/tools/gimpperspectivetool.c:99
+#: ../app/pdb/drawable-transform-cmds.c:309
+#: ../app/pdb/drawable-transform-cmds.c:394
+#: ../app/pdb/transform-tools-cmds.c:145 ../app/tools/gimpperspectivetool.c:69
 msgid "Perspective"
 msgstr ""
 
-#: ../app/pdb/drawable_transform_cmds.c:818
-#: ../app/pdb/drawable_transform_cmds.c:889
-#: ../app/pdb/transform_tools_cmds.c:350 ../app/tools/gimpsheartool.c:116
+#: ../app/pdb/drawable-transform-cmds.c:831
+#: ../app/pdb/drawable-transform-cmds.c:903
+#: ../app/pdb/transform-tools-cmds.c:361 ../app/tools/gimpsheartool.c:110
 #, fuzzy
 msgid "Shearing"
 msgstr "�ำลั��ยื�อ�ภา�..."
 
-#: ../app/pdb/drawable_transform_cmds.c:973
-#: ../app/pdb/transform_tools_cmds.c:424
+#: ../app/pdb/drawable-transform-cmds.c:988
+#: ../app/pdb/transform-tools-cmds.c:437
 #, fuzzy
 msgid "2D Transform"
 msgstr "��ลี�ย�รู�ร�า�"
 
-#: ../app/pdb/drawable_transform_cmds.c:1055
-#: ../app/pdb/drawable_transform_cmds.c:1147
-#: ../app/pdb/drawable_transform_cmds.c:1237
+#: ../app/pdb/drawable-transform-cmds.c:1071
+#: ../app/pdb/drawable-transform-cmds.c:1164
+#: ../app/pdb/drawable-transform-cmds.c:1255
 #, fuzzy
 msgid "2D Transforming"
 msgstr "�ำลั���ล�ลั�ษ�ะภา�..."
 
-#: ../app/pdb/edit_cmds.c:631 ../app/tools/gimpblendtool.c:225
+#: ../app/pdb/edit-cmds.c:725 ../app/tools/gimpblendtool.c:243
 #, fuzzy
 msgid "Blending"
 msgstr "�าร�ลื�สี..."
 
-#: ../app/pdb/gimppdb.c:303 ../app/pdb/gimppdb.c:368
+#: ../app/pdb/floating-sel-cmds.c:64
+#, fuzzy
+#| msgid "Cannot anchor this layer because it is not a floating selection."
+msgid "Cannot remove this layer because it is not a floating selection."
+msgstr "�ม�สามาร��ั��ัว�ั��ั���า��ี���� ��ื�อ��า��ม���������ื���ี��ลือ�ลอย�ัว"
+
+#: ../app/pdb/floating-sel-cmds.c:96
+msgid "Cannot anchor this layer because it is not a floating selection."
+msgstr "�ม�สามาร��ั��ัว�ั��ั���า��ี���� ��ื�อ��า��ม���������ื���ี��ลือ�ลอย�ัว"
+
+#: ../app/pdb/floating-sel-cmds.c:128
+#, fuzzy
+#| msgid "Cannot anchor this layer because it is not a floating selection."
+msgid ""
+"Cannot convert this layer to a normal layer because it is not a floating "
+"selection."
+msgstr "�ม�สามาร��ั��ัว�ั��ั���า��ี���� ��ื�อ��า��ม���������ื���ี��ลือ�ลอย�ัว"
+
+#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:306
+#: ../app/pdb/gimppdb.c:376
+#, fuzzy, c-format
+#| msgid "Help browser not found"
+msgid "Procedure '%s' not found"
+msgstr "�ม����ัว�รีย��ูราย�าร��วย�หลือ"
+
+#: ../app/pdb/gimppdb-utils.c:73
+msgid "Invalid empty brush name"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:82
+#, c-format
+msgid "Brush '%s' not found"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:87
+#, c-format
+msgid "Brush '%s' is not editable"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:113
+#, c-format
+msgid "Brush '%s' is not a generated brush"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:133
+msgid "Invalid empty pattern name"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:142
+#, fuzzy, c-format
+#| msgid "Patterns Menu"
+msgid "Pattern '%s' not found"
+msgstr "ราย�าร���ลาย"
+
+#: ../app/pdb/gimppdb-utils.c:162
+msgid "Invalid empty gradient name"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:171
+#, fuzzy, c-format
+#| msgid "Gradients Menu"
+msgid "Gradient '%s' not found"
+msgstr "�ม�ูสี�ร��า"
+
+#: ../app/pdb/gimppdb-utils.c:176
+#, c-format
+msgid "Gradient '%s' is not editable"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:197
+#, fuzzy
+#| msgid "Import palette"
+msgid "Invalid empty palette name"
+msgstr "�ำ���า�า�สี"
+
+#: ../app/pdb/gimppdb-utils.c:206
+#, fuzzy, c-format
+#| msgid "Palettes Menu"
+msgid "Palette '%s' not found"
+msgstr "ราย�าร�า�สี"
+
+#: ../app/pdb/gimppdb-utils.c:211
+#, c-format
+msgid "Palette '%s' is not editable"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:231
+msgid "Invalid empty font name"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:241
+#, c-format
+msgid "Font '%s' not found"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:260
+msgid "Invalid empty buffer name"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:270
+#, fuzzy, c-format
+#| msgid "Help browser not found"
+msgid "Named buffer '%s' not found"
+msgstr "�ม����ัว�รีย��ูราย�าร��วย�หลือ"
+
+#: ../app/pdb/gimppdb-utils.c:289
+msgid "Invalid empty paint method name"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:299
+#, c-format
+msgid "Paint method '%s' does not exist"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:316
 #, c-format
 msgid ""
-"PDB calling error:\n"
-"Procedure '%s' not found"
+"Item '%s' (%d) can not be used because it has not been added to an image"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:341
+#, c-format
+msgid "Item '%s' (%d) has already been added to an image"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:349
+#, c-format
+msgid "Trying to add item '%s' (%d) to wrong image"
 msgstr ""
 
-#: ../app/pdb/gimppdb.c:402
+#: ../app/pdb/gimppdb-utils.c:368
+#, c-format
+msgid "Item '%s' (%d) cannot be modified because its contents are locked"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:388
+#, c-format
+msgid "Item '%s' (%d) cannot be modified because it is a group item"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:409
+#, c-format
+msgid "Layer '%s' (%d) can not be used because it is not a text layer"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:450
+#, c-format
+msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:473
+#, c-format
+msgid "Image '%s' (%d) is already of type '%s'"
+msgstr ""
+
+#: ../app/pdb/gimppdb-utils.c:501
+#, c-format
+msgid "Vectors object %d does not contain stroke with ID %d"
+msgstr ""
+
+#: ../app/pdb/gimppdb.c:410
+#, c-format
+msgid ""
+"Procedure '%s' has been called with a wrong type for argument #%d. Expected %"
+"s, got %s."
+msgstr ""
+
+#: ../app/pdb/gimpprocedure.c:365 ../app/plug-in/gimppluginprocframe.c:208
+#, c-format
+msgid "Procedure '%s' returned no return values"
+msgstr ""
+
+#: ../app/pdb/gimpprocedure.c:621
+#, c-format
+msgid ""
+"Procedure '%s' returned a wrong value type for return value '%s' (#%d). "
+"Expected %s, got %s."
+msgstr ""
+
+#: ../app/pdb/gimpprocedure.c:633
+#, c-format
+msgid ""
+"Procedure '%s' has been called with a wrong value type for argument '%s' (#%"
+"d). Expected %s, got %s."
+msgstr ""
+
+#: ../app/pdb/gimpprocedure.c:665
+#, c-format
+msgid ""
+"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
+"in is trying to work on a layer that doesn't exist any longer."
+msgstr ""
+
+#: ../app/pdb/gimpprocedure.c:677
+#, c-format
+msgid ""
+"Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
+"likely a plug-in is trying to work on a layer that doesn't exist any longer."
+msgstr ""
+
+#: ../app/pdb/gimpprocedure.c:693
+#, c-format
+msgid ""
+"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
+"in is trying to work on an image that doesn't exist any longer."
+msgstr ""
+
+#: ../app/pdb/gimpprocedure.c:705
 #, c-format
 msgid ""
-"PDB calling error for procedure '%s':\n"
-"Argument #%d type mismatch (expected %s, got %s)"
+"Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
+"likely a plug-in is trying to work on an image that doesn't exist any longer."
 msgstr ""
 
-#: ../app/pdb/gimpprocedure.c:498
+#: ../app/pdb/gimpprocedure.c:725
 #, c-format
 msgid ""
-"PDB calling error for procedure '%s':\n"
-"Argument '%s' (#%d, type %s) type mismatch (got %s)."
+"Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value "
+"is out of range."
 msgstr ""
 
-#: ../app/pdb/gimpprocedure.c:536
+#: ../app/pdb/gimpprocedure.c:738
 #, c-format
 msgid ""
-"PDB calling error for procedure '%s':\n"
-"Argument '%s' (#%d, type %s) out of bounds (validation changed '%s' to '%s')"
+"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %"
+"s). This value is out of range."
 msgstr ""
 
-#: ../app/pdb/image_cmds.c:1946
+#: ../app/pdb/image-cmds.c:2311
 msgid ""
 "Image resolution is out of bounds, using the default resolution instead."
 msgstr ""
 
-#: ../app/pdb/selection_tools_cmds.c:206 ../app/tools/gimpfreeselecttool.c:95
+#: ../app/pdb/selection-tools-cmds.c:217 ../app/tools/gimpfreeselecttool.c:198
 msgid "Free Select"
 msgstr "�ลือ�อิสระ"
 
-#: ../app/plug-in/gimpenvirontable.c:245
+#: ../app/pdb/text-layer-cmds.c:89
+#, c-format
+msgid "Failed to create text layer"
+msgstr ""
+
+#: ../app/pdb/text-layer-cmds.c:162 ../app/pdb/text-layer-cmds.c:272
+#: ../app/pdb/text-layer-cmds.c:351 ../app/pdb/text-layer-cmds.c:424
+#: ../app/pdb/text-layer-cmds.c:496 ../app/pdb/text-layer-cmds.c:568
+#: ../app/pdb/text-layer-cmds.c:640 ../app/pdb/text-layer-cmds.c:712
+#: ../app/pdb/text-layer-cmds.c:784 ../app/pdb/text-layer-cmds.c:854
+#: ../app/pdb/text-layer-cmds.c:926 ../app/pdb/text-layer-cmds.c:998
+#: ../app/pdb/text-layer-cmds.c:1070 ../app/pdb/text-layer-cmds.c:1106
+#: ../app/pdb/text-layer-cmds.c:1185
+#, fuzzy
+#| msgid "Edit Layer Attributes"
+msgid "Set text layer attribute"
+msgstr "������ุ�สม�ั�ิ�ั���า�"
+
+#: ../app/pdb/vectors-cmds.c:644
+#, fuzzy
+#| msgid "Remove Path"
+msgid "Remove path stroke"
+msgstr "�อา�ส���า�ออ�"
+
+#: ../app/pdb/vectors-cmds.c:680
+#, fuzzy
+#| msgid "Connect Strokes"
+msgid "Close path stroke"
+msgstr "��อ�ส��"
+
+#: ../app/pdb/vectors-cmds.c:720
+#, fuzzy
+msgid "Translate path stroke"
+msgstr "ราย�าร�ู���ล"
+
+#: ../app/pdb/vectors-cmds.c:760
+#, fuzzy
+#| msgid "Scale Path"
+msgid "Scale path stroke"
+msgstr "�รั�สั�ส�ว��ส���า�"
+
+#: ../app/pdb/vectors-cmds.c:802
+#, fuzzy
+#| msgid "Rotate Path"
+msgid "Rotate path stroke"
+msgstr "หมุ��ส���า�"
+
+#: ../app/pdb/vectors-cmds.c:842 ../app/pdb/vectors-cmds.c:886
+#, fuzzy
+#| msgid "Flip Path"
+msgid "Flip path stroke"
+msgstr "�ลั���า��ส���า�"
+
+#: ../app/pdb/vectors-cmds.c:1015 ../app/pdb/vectors-cmds.c:1137
+#: ../app/pdb/vectors-cmds.c:1356
+#, fuzzy
+#| msgid "Add Stroke"
+msgid "Add path stroke"
+msgstr "��ิ�ม�ส��"
+
+#: ../app/pdb/vectors-cmds.c:1189 ../app/pdb/vectors-cmds.c:1242
+#: ../app/pdb/vectors-cmds.c:1303
+msgid "Extend path stroke"
+msgstr ""
+
+#: ../app/plug-in/gimpenvirontable.c:281
 #, c-format
 msgid "Empty variable name in environment file %s"
 msgstr ""
 
-#: ../app/plug-in/gimpenvirontable.c:263
+#: ../app/plug-in/gimpenvirontable.c:299
 #, c-format
 msgid "Illegal variable name in environment file %s: %s"
 msgstr ""
 
-#: ../app/plug-in/gimpinterpreterdb.c:262
+#: ../app/plug-in/gimpinterpreterdb.c:263
 #, c-format
 msgid "Bad interpreter referenced in interpreter file %s: %s"
 msgstr ""
 
-#: ../app/plug-in/gimpinterpreterdb.c:320
+#: ../app/plug-in/gimpinterpreterdb.c:322
 #, c-format
 msgid "Bad binary format string in interpreter file %s"
 msgstr ""
 
-#: ../app/plug-in/gimpplugin.c:429 ../app/plug-in/gimpplugin.c:468
+#: ../app/plug-in/gimpplugin-message.c:450
+#, c-format
+msgid ""
+"Calling error for procedure '%s':\n"
+"%s"
+msgstr ""
+
+#: ../app/plug-in/gimpplugin-message.c:459
 #, c-format
-msgid "Terminating plug-in: '%s'\n"
+msgid ""
+"Execution error for procedure '%s':\n"
+"%s"
 msgstr ""
 
-#: ../app/plug-in/gimpplugin.c:611
+#: ../app/plug-in/gimpplugin-progress.c:331
+#, fuzzy
+#| msgid "Cancel"
+msgid "Cancelled"
+msgstr "ย��ลิ�"
+
+#: ../app/plug-in/gimpplugin.c:638
 #, c-format
 msgid ""
 "Plug-in crashed: \"%s\"\n"
@@ -8389,147 +12564,144 @@ msgid ""
 "save your images and restart GIMP to be on the safe side."
 msgstr ""
 
-#: ../app/plug-in/gimppluginmanager.c:292
-#, fuzzy
-msgid "Plug-In Interpreters"
-msgstr "��ล��อร���ร��รม�สริม"
-
-#: ../app/plug-in/gimppluginmanager.c:299
-msgid "Plug-In Environment"
+#: ../app/plug-in/gimppluginmanager-call.c:172
+#: ../app/plug-in/gimppluginmanager-call.c:222
+#: ../app/plug-in/gimppluginmanager-call.c:320
+#, c-format
+msgid "Failed to run plug-in \"%s\""
 msgstr ""
 
-#: ../app/plug-in/gimppluginmanager.c:339
+#: ../app/plug-in/gimppluginmanager-restore.c:225
 #, fuzzy
 msgid "Searching Plug-Ins"
 msgstr "��ร��รม�สริม"
 
-#: ../app/plug-in/gimppluginmanager.c:370
+#: ../app/plug-in/gimppluginmanager-restore.c:274
 msgid "Resource configuration"
 msgstr "�าร�ำห����า�หล����อมูล"
 
-#. query any plug-ins that have changed since we last wrote out
-#. *  the pluginrc file
-#.
-#: ../app/plug-in/gimppluginmanager.c:396
+#: ../app/plug-in/gimppluginmanager-restore.c:310
 msgid "Querying new Plug-ins"
 msgstr ""
 
-#: ../app/plug-in/gimppluginmanager.c:424
-#, c-format
-msgid "Querying plug-in: '%s'\n"
-msgstr ""
-
-#. initialize the plug-ins
-#: ../app/plug-in/gimppluginmanager.c:433
+#: ../app/plug-in/gimppluginmanager-restore.c:360
 msgid "Initializing Plug-ins"
 msgstr ""
 
-#: ../app/plug-in/gimppluginmanager.c:459
-#, c-format
-msgid "Initializing plug-in: '%s'\n"
+#: ../app/plug-in/gimppluginmanager-restore.c:432
+msgid "Starting Extensions"
 msgstr ""
 
-#: ../app/plug-in/gimppluginmanager.c:584
-msgid "Starting Extensions"
+#: ../app/plug-in/gimppluginmanager.c:297
+#, fuzzy
+msgid "Plug-In Interpreters"
+msgstr "��ล��อร���ร��รม�สริม"
+
+#: ../app/plug-in/gimppluginmanager.c:304
+msgid "Plug-In Environment"
 msgstr ""
 
-#: ../app/plug-in/gimppluginmanager.c:592
+#: ../app/plug-in/gimppluginprocedure.c:995
+#, fuzzy, c-format
+#| msgid "Cannot create folder '%s': %s"
+msgid ""
+"Calling error for '%s':\n"
+"%s"
+msgstr "�ม�สามาร�สร�า���ล��อร� '%s': %s ���"
+
+#: ../app/plug-in/gimppluginprocedure.c:1007
+#, fuzzy, c-format
+msgid ""
+"Execution error for '%s':\n"
+"%s"
+msgstr "��ิ���อ�ิ��ลา���ะ��ีย� '%s': %s"
+
+#: ../app/plug-in/plug-in-icc-profile.c:112
+#: ../app/plug-in/plug-in-icc-profile.c:187
+#: ../app/plug-in/plug-in-icc-profile.c:246
+#, fuzzy, c-format
+msgid "Error running '%s'"
+msgstr "��ิ���อ�ิ��ลา���ะ��ีย� '%s': %s"
+
+#: ../app/plug-in/plug-in-icc-profile.c:136
+#: ../app/plug-in/plug-in-icc-profile.c:197
+#: ../app/plug-in/plug-in-icc-profile.c:256
 #, c-format
-msgid "Starting extension: '%s'\n"
+msgid "Plug-In missing (%s)"
 msgstr ""
 
-#: ../app/plug-in/plug-in-rc.c:206
+#: ../app/plug-in/plug-in-rc.c:205
 #, c-format
 msgid "Skipping '%s': wrong GIMP protocol version."
 msgstr ""
 
-#: ../app/plug-in/plug-in-rc.c:472
+#: ../app/plug-in/plug-in-rc.c:478
 #, c-format
 msgid "invalid value '%s' for icon type"
 msgstr "��า '%s' �ม��ุ���อ� สำหรั��ระ�ภ��อ��อ�อ�"
 
-#: ../app/plug-in/plug-in-rc.c:487
+#: ../app/plug-in/plug-in-rc.c:493
 #, c-format
 msgid "invalid value '%ld' for icon type"
 msgstr "��า '%ld' �ม��ู���อ� สำหรั��ระ�ภ��อ��อ�อ�"
 
-#: ../app/text/text-enums.c:81
-msgid "Left justified"
-msgstr "�ิ���าย"
-
-#: ../app/text/text-enums.c:82
-msgid "Right justified"
-msgstr "�ิ��วา"
-
-#: ../app/text/text-enums.c:83
-msgid "Centered"
-msgstr "�ร��ลา�"
-
-#: ../app/text/text-enums.c:84
-msgid "Filled"
-msgstr "���ม"
-
 #. This is a so-called pangram; it's supposed to
 #. contain all characters found in the alphabet.
-#: ../app/text/gimpfont.c:42
+#: ../app/text/gimpfont.c:43
 msgid ""
 "Pack my box with\n"
 "five dozen liquor jugs."
 msgstr ""
 
-#: ../app/text/gimptext-compat.c:108 ../app/tools/gimptexttool.c:711
+#: ../app/text/gimptext-compat.c:107 ../app/tools/gimptexttool.c:1368
 msgid "Add Text Layer"
 msgstr "��ิ�ม�ั���า���อ�วาม"
 
-#: ../app/text/gimptext-parasite.c:167
-msgid "(invalid UTF-8 string)"
-msgstr "(��อ�วาม��� UTF-8 ����ม����)"
-
-#: ../app/text/gimptextlayer.c:138
+#: ../app/text/gimptextlayer.c:139
 msgid "Text Layer"
 msgstr "�ั���า���อ�วาม"
 
-#: ../app/text/gimptextlayer.c:139
+#: ../app/text/gimptextlayer.c:140
 msgid "Rename Text Layer"
 msgstr "��ลี�ย��ื�อ�ั���า���อ�วาม"
 
-#: ../app/text/gimptextlayer.c:140
+#: ../app/text/gimptextlayer.c:141
 msgid "Move Text Layer"
 msgstr "ย�าย�ั���า���อ�วาม"
 
-#: ../app/text/gimptextlayer.c:141
+#: ../app/text/gimptextlayer.c:142
 msgid "Scale Text Layer"
 msgstr "�รั�สั�ส�ว��ั���า���อ�วาม"
 
-#: ../app/text/gimptextlayer.c:142
+#: ../app/text/gimptextlayer.c:143
 msgid "Resize Text Layer"
 msgstr "�รั���า��ั���า���อ�วาม"
 
-#: ../app/text/gimptextlayer.c:143
+#: ../app/text/gimptextlayer.c:144
 msgid "Flip Text Layer"
 msgstr "�ลั���า��ั���า���อ�วาม"
 
-#: ../app/text/gimptextlayer.c:144
+#: ../app/text/gimptextlayer.c:145
 msgid "Rotate Text Layer"
 msgstr "หมุ��ั���า���อ�วาม"
 
-#: ../app/text/gimptextlayer.c:145
+#: ../app/text/gimptextlayer.c:146
 msgid "Transform Text Layer"
 msgstr "��ล�ลั�ษ�ะ�ั���า���อ�วาม"
 
-#: ../app/text/gimptextlayer.c:497
+#: ../app/text/gimptextlayer.c:507
 msgid "Discard Text Information"
 msgstr "ละ�ิ����อมูล��อ�วาม"
 
-#: ../app/text/gimptextlayer.c:547
+#: ../app/text/gimptextlayer.c:560
 msgid "Due to lack of any fonts, text functionality is not available."
 msgstr ""
 
-#: ../app/text/gimptextlayer.c:582
+#: ../app/text/gimptextlayer.c:611
 msgid "Empty Text Layer"
 msgstr "�ั���า���อ�วามว�า�"
 
-#: ../app/text/gimptextlayer-xcf.c:73
+#: ../app/text/gimptextlayer-xcf.c:75
 #, c-format
 msgid ""
 "Problems parsing the text parasite for layer '%s':\n"
@@ -8539,116 +12711,173 @@ msgid ""
 "you don't need to worry about this."
 msgstr ""
 
-#: ../app/tools/gimp-tools.c:320
+#: ../app/text/text-enums.c:23
+msgctxt "text-box-mode"
+msgid "Dynamic"
+msgstr ""
+
+#: ../app/text/text-enums.c:24
+#, fuzzy
+msgctxt "text-box-mode"
+msgid "Fixed"
+msgstr "���ม"
+
+#: ../app/tools/gimp-tools.c:335
 #, fuzzy
 msgid ""
 "This tool has\n"
 "no options."
 msgstr "��รื�อ�มือ�ี��ม�มี�ัว�ลือ�"
 
-#: ../app/tools/gimpairbrushtool.c:55
+#: ../app/tools/gimpairbrushtool.c:54
 #, fuzzy
 msgid "Airbrush Tool: Paint using a brush, with variable pressure"
 msgstr "�ู��ั�ลม����ร������ร�ั�"
 
-#: ../app/tools/gimpairbrushtool.c:56
+#: ../app/tools/gimpairbrushtool.c:55
 msgid "_Airbrush"
 msgstr "�ู�_�ั�ลม"
 
-#: ../app/tools/gimpairbrushtool.c:95 ../app/tools/gimpconvolvetool.c:217
-#: ../app/tools/gimpsmudgetool.c:98
+#: ../app/tools/gimpairbrushtool.c:88
+#, fuzzy
+#| msgid "Pick only"
+msgid "Motion only"
+msgstr "�������า�ั��"
+
+#: ../app/tools/gimpairbrushtool.c:97 ../app/tools/gimpconvolvetool.c:216
+#: ../app/tools/gimpsmudgetool.c:96
 msgid "Rate:"
 msgstr "อั�รา:"
 
-#: ../app/tools/gimpairbrushtool.c:101
-msgid "Pressure:"
-msgstr "�ร��ั�:"
+#: ../app/tools/gimpairbrushtool.c:103
+#, fuzzy
+#| msgid "Yellow:"
+msgid "Flow:"
+msgstr "�หลือ�:"
 
-#: ../app/tools/gimpaligntool.c:117 ../app/tools/gimpaligntool.c:577
+#: ../app/tools/gimpaligntool.c:135 ../app/tools/gimpaligntool.c:768
 #, fuzzy
 msgid "Align"
 msgstr "�ั��รีย��ล�ว"
 
-#: ../app/tools/gimpaligntool.c:118
+#: ../app/tools/gimpaligntool.c:136
 msgid "Alignment Tool: Align or arrange layers and other objects"
 msgstr ""
 
-#: ../app/tools/gimpaligntool.c:119
+#: ../app/tools/gimpaligntool.c:137
 #, fuzzy
 msgid "_Align"
 msgstr "�ั��รีย��ล�ว"
 
-#: ../app/tools/gimpaligntool.c:589
+#: ../app/tools/gimpaligntool.c:600
+msgid "Click on a layer, path or guide, or Click-Drag to pick several layers"
+msgstr ""
+
+#: ../app/tools/gimpaligntool.c:609
+#, fuzzy
+msgid "Click to pick this layer as first item"
+msgstr "����ื�อ�ลือ��ส���า��ี��ะ�����"
+
+#: ../app/tools/gimpaligntool.c:617
+#, fuzzy
+msgid "Click to add this layer to the list"
+msgstr "����ื�อ��ิ��ส���า�"
+
+#: ../app/tools/gimpaligntool.c:621
+#, fuzzy
+msgid "Click to pick this guide as first item"
+msgstr "����ื�อ�ลือ��ส���า��ี��ะ�����"
+
+#: ../app/tools/gimpaligntool.c:629
+#, fuzzy
+msgid "Click to add this guide to the list"
+msgstr "����ื�อ��ิ��ส���า�"
+
+#: ../app/tools/gimpaligntool.c:633
+#, fuzzy
+msgid "Click to pick this path as first item"
+msgstr "����ื�อ�ลือ��ส���า��ี��ะ�����"
+
+#: ../app/tools/gimpaligntool.c:641
+#, fuzzy
+msgid "Click to add this path to the list"
+msgstr "����ื�อ�ลือ��ส���า��ี��ะ�����"
+
+#: ../app/tools/gimpaligntool.c:780
 #, fuzzy
 msgid "Relative to:"
 msgstr "��รื�อ�มือสลั��ึ��"
 
-#: ../app/tools/gimpaligntool.c:607
+#: ../app/tools/gimpaligntool.c:798
 msgid "Align left edge of target"
 msgstr ""
 
-#: ../app/tools/gimpaligntool.c:613
+#: ../app/tools/gimpaligntool.c:804
 msgid "Align center of target"
 msgstr ""
 
-#: ../app/tools/gimpaligntool.c:619
+#: ../app/tools/gimpaligntool.c:810
 msgid "Align right edge of target"
 msgstr ""
 
-#: ../app/tools/gimpaligntool.c:629
+#: ../app/tools/gimpaligntool.c:820
 msgid "Align top edge of target"
 msgstr ""
 
-#: ../app/tools/gimpaligntool.c:635
+#: ../app/tools/gimpaligntool.c:826
 msgid "Align middle of target"
 msgstr ""
 
-#: ../app/tools/gimpaligntool.c:641
+#: ../app/tools/gimpaligntool.c:832
 msgid "Align bottom of target"
 msgstr ""
 
-#: ../app/tools/gimpaligntool.c:645
+#: ../app/tools/gimpaligntool.c:836
 #, fuzzy
 msgid "Distribute"
 msgstr "_�ิ���ี�ยว"
 
-#: ../app/tools/gimpaligntool.c:659
+#: ../app/tools/gimpaligntool.c:850
 msgid "Distribute left edges of targets"
 msgstr ""
 
-#: ../app/tools/gimpaligntool.c:666
+#: ../app/tools/gimpaligntool.c:857
 msgid "Distribute horizontal centers of targets"
 msgstr ""
 
-#: ../app/tools/gimpaligntool.c:673
+#: ../app/tools/gimpaligntool.c:864
 msgid "Distribute right edges of targets"
 msgstr ""
 
-#: ../app/tools/gimpaligntool.c:683
+#: ../app/tools/gimpaligntool.c:874
 msgid "Distribute top edges of targets"
 msgstr ""
 
-#: ../app/tools/gimpaligntool.c:690
+#: ../app/tools/gimpaligntool.c:881
 msgid "Distribute vertical centers of targets"
 msgstr ""
 
-#: ../app/tools/gimpaligntool.c:696
+#: ../app/tools/gimpaligntool.c:887
 msgid "Distribute bottoms of targets"
 msgstr ""
 
-#: ../app/tools/gimpaligntool.c:704 ../app/tools/gimpblendoptions.c:213
+#: ../app/tools/gimpaligntool.c:895 ../app/tools/gimpblendoptions.c:221
 msgid "Offset:"
 msgstr ""
 
-#: ../app/tools/gimpblendoptions.c:222 ../app/widgets/gimpbrusheditor.c:146
+#: ../app/tools/gimpblendoptions.c:215 ../app/tools/gimppaintoptions-gui.c:305
+msgid "Gradient:"
+msgstr "สี�ร��า:"
+
+#: ../app/tools/gimpblendoptions.c:231 ../app/widgets/gimpbrusheditor.c:145
 msgid "Shape:"
 msgstr "รู��ร�:"
 
-#: ../app/tools/gimpblendoptions.c:228 ../app/tools/gimppaintoptions-gui.c:487
+#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:236
 msgid "Repeat:"
 msgstr "�ว���ำ:"
 
-#: ../app/tools/gimpblendoptions.c:246
+#: ../app/tools/gimpblendoptions.c:256
 msgid "Adaptive supersampling"
 msgstr ""
 
@@ -8659,67 +12888,89 @@ msgstr "�วามลึ�สุ�:"
 
 #: ../app/tools/gimpblendoptions.c:271
 #: ../app/tools/gimpbucketfilloptions.c:287
-#: ../app/tools/gimpselectionoptions.c:431
+#: ../app/tools/gimpregionselectoptions.c:219
 msgid "Threshold:"
 msgstr ""
 
-#: ../app/tools/gimpblendtool.c:107
+#: ../app/tools/gimpblendtool.c:110
 #, fuzzy
 msgid "Blend Tool: Fill selected area with a color gradient"
 msgstr "��ิม��วยสี�ร��า"
 
-#: ../app/tools/gimpblendtool.c:108
+#: ../app/tools/gimpblendtool.c:111
 msgid "Blen_d"
 msgstr "�ร�_�า"
 
-#: ../app/tools/gimpblendtool.c:161
+#: ../app/tools/gimpblendtool.c:167
 #, fuzzy
 msgid "Blend does not operate on indexed layers."
 msgstr "�าร��ลี�ย�ห����า�ั��ม�สามาร��������ั��ั���า�����ั��ีสี"
 
-#: ../app/tools/gimpblendtool.c:378
+#: ../app/tools/gimpblendtool.c:423 ../app/tools/gimppainttool.c:634
+#, fuzzy, c-format
+msgid "%s for constrained angles"
+msgstr "วั�ระยะ�ละมุม"
+
+#: ../app/tools/gimpblendtool.c:424
+#, fuzzy, c-format
+msgid "%s to move the whole line"
+msgstr "����ื�อ��ิ��ส���า�"
+
+#: ../app/tools/gimpblendtool.c:428
 msgid "Blend: "
 msgstr "�ลื�สี: "
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:101
+#: ../app/tools/gimpbrightnesscontrasttool.c:112
 msgid "Brightness/Contrast Tool: Adjust brightness and contrast"
 msgstr ""
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:102
+#: ../app/tools/gimpbrightnesscontrasttool.c:113
 msgid "B_rightness-Contrast..."
 msgstr ""
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:122
+#: ../app/tools/gimpbrightnesscontrasttool.c:133
 msgid "Adjust Brightness and Contrast"
 msgstr ""
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:167
+#: ../app/tools/gimpbrightnesscontrasttool.c:135
+msgid "Import Brightness-Contrast settings"
+msgstr ""
+
+#: ../app/tools/gimpbrightnesscontrasttool.c:136
+msgid "Export Brightness-Contrast settings"
+msgstr ""
+
+#: ../app/tools/gimpbrightnesscontrasttool.c:183
 msgid "Brightness-Contrast does not operate on indexed layers."
 msgstr ""
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:283
+#: ../app/tools/gimpbrightnesscontrasttool.c:320
 msgid "_Brightness:"
 msgstr ""
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:298
+#: ../app/tools/gimpbrightnesscontrasttool.c:335
 msgid "Con_trast:"
 msgstr ""
 
-#: ../app/tools/gimpbucketfilloptions.c:100
+#: ../app/tools/gimpbrightnesscontrasttool.c:349
+msgid "Edit these Settings as Levels"
+msgstr ""
+
+#: ../app/tools/gimpbucketfilloptions.c:99
 msgid "Allow completely transparent regions to be filled"
 msgstr "อ�ุ�า��ห���ิมสีล����ื���ี���ร���ส���"
 
-#: ../app/tools/gimpbucketfilloptions.c:106
+#: ../app/tools/gimpbucketfilloptions.c:105
 msgid "Base filled area on all visible layers"
 msgstr "��ิมสีล����ุ��ั���า��ี�มอ��ห��"
 
-#: ../app/tools/gimpbucketfilloptions.c:112
-#: ../app/tools/gimpselectionoptions.c:122
+#: ../app/tools/gimpbucketfilloptions.c:111
+#: ../app/tools/gimpregionselectoptions.c:95
 msgid "Maximum color difference"
 msgstr "�วาม��า�สีสู�สุ�"
 
 #. fill type
-#: ../app/tools/gimpbucketfilloptions.c:226
+#: ../app/tools/gimpbucketfilloptions.c:225
 #, fuzzy, c-format
 msgid "Fill Type  (%s)"
 msgstr "�ระ�ภ��าร��ิม  %s"
@@ -8739,7 +12990,6 @@ msgid "Fill similar colors"
 msgstr "สี�ี��ล�าย�ั�"
 
 #: ../app/tools/gimpbucketfilloptions.c:253
-#: ../app/tools/gimpselectionoptions.c:403
 msgid "Finding Similar Colors"
 msgstr "หาสี�ี��ล�าย�ั�"
 
@@ -8747,10 +12997,10 @@ msgstr "หาสี�ี��ล�าย�ั�"
 msgid "Fill transparent areas"
 msgstr "��ิม�ื���ี���ร���ส"
 
-#: ../app/tools/gimpbucketfilloptions.c:275 ../app/tools/gimpclonetool.c:114
-#: ../app/tools/gimpcolorpickeroptions.c:160 ../app/tools/gimphealtool.c:103
-#: ../app/tools/gimprectangleoptions.c:521
-#: ../app/tools/gimpselectionoptions.c:419
+#: ../app/tools/gimpbucketfilloptions.c:275 ../app/tools/gimpclonetool.c:113
+#: ../app/tools/gimpcolorpickeroptions.c:150 ../app/tools/gimphealtool.c:98
+#: ../app/tools/gimpperspectiveclonetool.c:951
+#: ../app/tools/gimpregionselectoptions.c:207
 msgid "Sample merged"
 msgstr "�ลือ����รวมภา�"
 
@@ -8759,59 +13009,61 @@ msgstr "�ลือ����รวมภา�"
 msgid "Fill by:"
 msgstr "��ิม��า�วาม�ึ��ส�"
 
-#: ../app/tools/gimpbucketfilltool.c:88
+#: ../app/tools/gimpbucketfilltool.c:85
 msgid "Bucket Fill"
 msgstr "��สี"
 
-#: ../app/tools/gimpbucketfilltool.c:89
+#: ../app/tools/gimpbucketfilltool.c:86
 #, fuzzy
 msgid "Bucket Fill Tool: Fill selected area with a color or pattern"
 msgstr "��ิม��วยสีหรือ���ลาย"
 
-#: ../app/tools/gimpbucketfilltool.c:90
+#: ../app/tools/gimpbucketfilltool.c:87
 msgid "_Bucket Fill"
 msgstr "�_�สี"
 
-#: ../app/tools/gimpbycolorselecttool.c:65
+#: ../app/tools/gimpbycolorselecttool.c:67
 msgid "Select by Color"
 msgstr "�ลือ��า�สี"
 
-#: ../app/tools/gimpbycolorselecttool.c:66
+#: ../app/tools/gimpbycolorselecttool.c:68
 msgid "Select by Color Tool: Select regions with similar colors"
 msgstr ""
 
-#: ../app/tools/gimpbycolorselecttool.c:67
+#: ../app/tools/gimpbycolorselecttool.c:69
 msgid "_By Color Select"
 msgstr "_�าม�าร�ลือ�สี"
 
-#: ../app/tools/gimpclonetool.c:62
+#: ../app/tools/gimpclonetool.c:61
 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush"
 msgstr ""
 
-#: ../app/tools/gimpclonetool.c:63
+#: ../app/tools/gimpclonetool.c:62
 msgid "_Clone"
 msgstr "_ลอ����"
 
-#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:89
+#: ../app/tools/gimpclonetool.c:85 ../app/tools/gimpclonetool.c:88
 #, fuzzy
 msgid "Click to clone"
 msgstr "����ื�อ�ลือ��ส���า��ี��ะ�����"
 
-#: ../app/tools/gimpclonetool.c:87 ../app/tools/gimpclonetool.c:91
+#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:90
 #, fuzzy, c-format
 msgid "%s to set a new clone source"
 msgstr "����ื�อสร�า��ส���า��หม�"
 
-#: ../app/tools/gimpclonetool.c:90
+#: ../app/tools/gimpclonetool.c:89
 #, fuzzy
 msgid "Click to set a new clone source"
 msgstr "����ื�อสร�า��ส���า��หม�"
 
-#: ../app/tools/gimpclonetool.c:109
+#: ../app/tools/gimpclonetool.c:108
+#: ../app/tools/gimpperspectiveclonetool.c:946
 msgid "Source"
 msgstr "�หล����อมูล"
 
-#: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:115
+#: ../app/tools/gimpclonetool.c:129 ../app/tools/gimphealtool.c:110
+#: ../app/tools/gimpperspectiveclonetool.c:967
 #, fuzzy
 msgid "Alignment:"
 msgstr "�าร�ั��รีย�"
@@ -8828,679 +13080,852 @@ msgstr "_สม�ุลสี"
 msgid "Adjust Color Balance"
 msgstr "�รั�สม�ุลสี"
 
-#: ../app/tools/gimpcolorbalancetool.c:159
+#: ../app/tools/gimpcolorbalancetool.c:115
+#, fuzzy
+#| msgid "Color Balance"
+msgid "Import Color Balance Settings"
+msgstr "สม�ุลสี"
+
+#: ../app/tools/gimpcolorbalancetool.c:116
+#, fuzzy
+#| msgid "Color Balance"
+msgid "Export Color Balance Settings"
+msgstr "สม�ุลสี"
+
+#: ../app/tools/gimpcolorbalancetool.c:162
 #, fuzzy
 msgid "Color Balance operates only on RGB color layers."
 msgstr "�ำสั��สม�ุลสี�ำ�า����ั���า���� RGB ���า�ั��"
 
-#: ../app/tools/gimpcolorbalancetool.c:242
+#: ../app/tools/gimpcolorbalancetool.c:267
 #, fuzzy
 msgid "Select Range to Adjust"
 msgstr "�ลือ���ว��ี��ะ�รั����"
 
-#: ../app/tools/gimpcolorbalancetool.c:249 ../app/tools/gimplevelstool.c:176
+#: ../app/tools/gimpcolorbalancetool.c:276 ../app/tools/gimplevelstool.c:172
 msgid "Adjust Color Levels"
 msgstr ""
 
-#: ../app/tools/gimpcolorbalancetool.c:265
-#: ../app/tools/gimphuesaturationtool.c:238
+#: ../app/tools/gimpcolorbalancetool.c:293
+#: ../app/tools/gimphuesaturationtool.c:252
 msgid "Cyan"
 msgstr ""
 
-#: ../app/tools/gimpcolorbalancetool.c:272
-#: ../app/tools/gimphuesaturationtool.c:240
+#: ../app/tools/gimpcolorbalancetool.c:293
+#: ../app/tools/gimphuesaturationtool.c:249
+msgid "Red"
+msgstr "สี���"
+
+#: ../app/tools/gimpcolorbalancetool.c:302
+#: ../app/tools/gimphuesaturationtool.c:254
 msgid "Magenta"
 msgstr ""
 
-#: ../app/tools/gimpcolorbalancetool.c:279
-#: ../app/tools/gimphuesaturationtool.c:236
+#: ../app/tools/gimpcolorbalancetool.c:302
+#: ../app/tools/gimphuesaturationtool.c:251
+msgid "Green"
+msgstr "สี��ียว"
+
+#: ../app/tools/gimpcolorbalancetool.c:311
+#: ../app/tools/gimphuesaturationtool.c:250
 msgid "Yellow"
 msgstr "�หลือ�"
 
-#: ../app/tools/gimpcolorbalancetool.c:289
+#: ../app/tools/gimpcolorbalancetool.c:311
+#: ../app/tools/gimphuesaturationtool.c:253
+msgid "Blue"
+msgstr "��ำ��ิ�"
+
+#: ../app/tools/gimpcolorbalancetool.c:322
 #, fuzzy
 msgid "R_eset Range"
 msgstr "�ลั_���า��ิม�����ล"
 
-#: ../app/tools/gimpcolorbalancetool.c:298
+#: ../app/tools/gimpcolorbalancetool.c:331
 msgid "Preserve _luminosity"
 msgstr "��ส_ภา��วามสว�า�"
 
-#: ../app/tools/gimpcolorizetool.c:93
+#: ../app/tools/gimpcolorizetool.c:91
 #, fuzzy
 msgid "Colorize Tool: Colorize the image"
 msgstr "ย�อมสีภา�"
 
-#: ../app/tools/gimpcolorizetool.c:94
+#: ../app/tools/gimpcolorizetool.c:92
 msgid "Colori_ze..."
 msgstr "ย�อ_มสี"
 
-#: ../app/tools/gimpcolorizetool.c:111
+#: ../app/tools/gimpcolorizetool.c:109
 msgid "Colorize the Image"
 msgstr "ย�อมสีภา�"
 
-#: ../app/tools/gimpcolorizetool.c:156
+#: ../app/tools/gimpcolorizetool.c:111
+msgid "Import Colorize Settings"
+msgstr ""
+
+#: ../app/tools/gimpcolorizetool.c:112
+msgid "Export Colorize Settings"
+msgstr ""
+
+#: ../app/tools/gimpcolorizetool.c:157
 msgid "Colorize operates only on RGB color layers."
 msgstr "�ำสั��ย�อมสี�ำ�า����ั���า���� RGB ���า�ั��"
 
-#: ../app/tools/gimpcolorizetool.c:196
+#: ../app/tools/gimpcolorizetool.c:225
 msgid "Select Color"
 msgstr "�ลือ�สี"
 
-#: ../app/tools/gimpcolorizetool.c:214
-#: ../app/tools/gimphuesaturationtool.c:367
+#: ../app/tools/gimpcolorizetool.c:242
+#: ../app/tools/gimphuesaturationtool.c:385
 msgid "_Hue:"
 msgstr ""
 
-#: ../app/tools/gimpcolorizetool.c:228
-#: ../app/tools/gimphuesaturationtool.c:403
+#: ../app/tools/gimpcolorizetool.c:257
+#: ../app/tools/gimphuesaturationtool.c:423
 msgid "_Saturation:"
 msgstr ""
 
-#: ../app/tools/gimpcolorizetool.c:242
-#: ../app/tools/gimphuesaturationtool.c:385
+#: ../app/tools/gimpcolorizetool.c:272
+#: ../app/tools/gimphuesaturationtool.c:404
 msgid "_Lightness:"
 msgstr ""
 
+#: ../app/tools/gimpcoloroptions.c:75
+#, fuzzy
+#| msgid "Color Picker Information"
+msgid "Color Picker Average Radius"
+msgstr "��อมูล�ัว������าสี"
+
 #: ../app/tools/gimpcoloroptions.c:161
 msgid "Sample average"
 msgstr "��า��ลี�ย�ารสุ�ม"
 
-#: ../app/tools/gimpcoloroptions.c:171 ../app/tools/gimpselectionoptions.c:380
-#: ../app/widgets/gimpbrusheditor.c:154
+#: ../app/tools/gimpcoloroptions.c:171
+#: ../app/tools/gimprectangleselectoptions.c:175
+#: ../app/tools/gimpselectionoptions.c:280
+#: ../app/widgets/gimpbrusheditor.c:153
 msgid "Radius:"
 msgstr "รัศมี:"
 
 #. the pick FG/BG frame
-#: ../app/tools/gimpcolorpickeroptions.c:165
+#: ../app/tools/gimpcolorpickeroptions.c:155
 #, fuzzy, c-format
 msgid "Pick Mode  (%s)"
 msgstr "ระ���าร����สี %s"
 
 #. the use_info_window toggle button
-#: ../app/tools/gimpcolorpickeroptions.c:174
+#: ../app/tools/gimpcolorpickeroptions.c:164
 #, fuzzy, c-format
 msgid "Use info window  (%s)"
 msgstr "���ห��า��า���อมูล"
 
-#: ../app/tools/gimpcolorpickertool.c:99
+#: ../app/tools/gimpcolorpickertool.c:96
 msgid "Color Picker"
 msgstr "�ัว������าสี"
 
-#: ../app/tools/gimpcolorpickertool.c:100
+#: ../app/tools/gimpcolorpickertool.c:97
 #, fuzzy
 msgid "Color Picker Tool: Set colors from image pixels"
 msgstr "������าสี�า�ภา�"
 
-#: ../app/tools/gimpcolorpickertool.c:101
+#: ../app/tools/gimpcolorpickertool.c:98
 msgid "C_olor Picker"
 msgstr "�ัว���_���าสี"
 
+#: ../app/tools/gimpcolorpickertool.c:242
+#, fuzzy
+msgid "Click in any image to view its color"
+msgstr "��ลี�ย�สี�ืิ��ห��า�ส���ิ�ั�"
+
+#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:493
+#, fuzzy
+msgid "Click in any image to pick the foreground color"
+msgstr "��ลี�ย�สี�ืิ��ห��า�ส���ิ�ั�"
+
+#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:499
+#, fuzzy
+msgid "Click in any image to pick the background color"
+msgstr "��ลี�ย�สี�ื��หลั��ส���ิ�ั�"
+
+#: ../app/tools/gimpcolorpickertool.c:265
+#, fuzzy
+msgid "Click in any image to add the color to the palette"
+msgstr "��ลี�ย�สี�ืิ��ห��า�ส���ิ�ั�"
+
 #. tool->display->shell
-#: ../app/tools/gimpcolorpickertool.c:271
+#: ../app/tools/gimpcolorpickertool.c:318
 msgid "Color Picker Information"
 msgstr "��อมูล�ัว������าสี"
 
-#: ../app/tools/gimpcolortool.c:252 ../app/tools/gimpcolortool.c:427
+#: ../app/tools/gimpcolortool.c:260 ../app/tools/gimpcolortool.c:440
 #, fuzzy
 msgid "Move Sample Point: "
 msgstr "��ลื�อ�ย�าย�ี���ี��ลือ�"
 
-#: ../app/tools/gimpcolortool.c:421
+#: ../app/tools/gimpcolortool.c:433
 msgid "Cancel Sample Point"
 msgstr ""
 
-#: ../app/tools/gimpcolortool.c:428
+#: ../app/tools/gimpcolortool.c:441
 msgid "Add Sample Point: "
 msgstr ""
 
-#: ../app/tools/gimpconvolvetool.c:73
+#: ../app/tools/gimpconvolvetool.c:72
 #, fuzzy
 msgid "Blur / Sharpen"
 msgstr "�ำ�ห�มัวหรือ�ม�ั�"
 
-#: ../app/tools/gimpconvolvetool.c:74
+#: ../app/tools/gimpconvolvetool.c:73
 msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush"
 msgstr ""
 
-#: ../app/tools/gimpconvolvetool.c:75
+#: ../app/tools/gimpconvolvetool.c:74
 #, fuzzy
 msgid "Bl_ur / Sharpen"
 msgstr "�ำ�ห�มัวหรือ�ม�ั�"
 
-#: ../app/tools/gimpconvolvetool.c:170
+#: ../app/tools/gimpconvolvetool.c:169
 #, fuzzy
 msgid "Click to blur"
 msgstr "����ื�อ��ิ��ส���า�"
 
-#: ../app/tools/gimpconvolvetool.c:171
+#: ../app/tools/gimpconvolvetool.c:170
 #, fuzzy
 msgid "Click to blur the line"
 msgstr "����ื�อ��ิ��ส���า�"
 
-#: ../app/tools/gimpconvolvetool.c:172
+#: ../app/tools/gimpconvolvetool.c:171
 #, fuzzy, c-format
 msgid "%s to sharpen"
 msgstr "�ำ�ห�มัวหรือ�ม�ั�"
 
-#: ../app/tools/gimpconvolvetool.c:176
+#: ../app/tools/gimpconvolvetool.c:175
 #, fuzzy
 msgid "Click to sharpen"
 msgstr "�ำ�ห�มัวหรือ�ม�ั�"
 
-#: ../app/tools/gimpconvolvetool.c:177
+#: ../app/tools/gimpconvolvetool.c:176
 #, fuzzy
 msgid "Click to sharpen the line"
 msgstr "����ื�อ��ิ��ส���า�"
 
-#: ../app/tools/gimpconvolvetool.c:178
+#: ../app/tools/gimpconvolvetool.c:177
 #, c-format
 msgid "%s to blur"
 msgstr ""
 
 #. the type radio box
-#: ../app/tools/gimpconvolvetool.c:199
+#: ../app/tools/gimpconvolvetool.c:198
 #, fuzzy, c-format
 msgid "Convolve Type  (%s)"
 msgstr "�ระ�ภ��าร�ิ���ลียว  %s"
 
-#: ../app/tools/gimpcropoptions.c:140
+#: ../app/tools/gimpcropoptions.c:160
 msgid "Current layer only"
 msgstr "�ั���า��ั��ุ�ั����า�ั��"
 
-#: ../app/tools/gimpcroptool.c:105
+#: ../app/tools/gimpcropoptions.c:166
+msgid "Allow growing"
+msgstr ""
+
+#: ../app/tools/gimpcroptool.c:127
 msgid "Crop"
 msgstr "�ั��รอ�"
 
-#: ../app/tools/gimpcroptool.c:106
+#: ../app/tools/gimpcroptool.c:128
 msgid "Crop Tool: Remove edge areas from image or layer"
 msgstr ""
 
-#: ../app/tools/gimpcroptool.c:107
+#: ../app/tools/gimpcroptool.c:129
 #, fuzzy
 msgid "_Crop"
 msgstr "�ั��รอ�"
 
-#: ../app/tools/gimpcroptool.c:244
+#: ../app/tools/gimpcroptool.c:271
 #, fuzzy
-msgid "Click or press enter to crop"
+msgid "Click or press Enter to crop"
 msgstr "����ื�อล��ุ�สมอ�ี�"
 
-#: ../app/tools/gimpcurvestool.c:149
+#: ../app/tools/gimpcroptool.c:328
+#, fuzzy
+#| msgid "There is no active layer or channel to cut from."
+msgid "There is no active layer to crop."
+msgstr "�ม�มี�ั���า�หรือ�����ล�ี��ำลั��ำ�า�อยู��ห��ั�ออ�มา"
+
+#: ../app/tools/gimpcurvestool.c:141
 msgid "Curves Tool: Adjust color curves"
 msgstr ""
 
-#: ../app/tools/gimpcurvestool.c:150
+#: ../app/tools/gimpcurvestool.c:142
 msgid "_Curves..."
 msgstr ""
 
-#: ../app/tools/gimpcurvestool.c:176
+#: ../app/tools/gimpcurvestool.c:168
 msgid "Adjust Color Curves"
 msgstr ""
 
-#: ../app/tools/gimpcurvestool.c:178
-msgid "Load Curves"
-msgstr ""
-
-#: ../app/tools/gimpcurvestool.c:179
-msgid "Load curves settings from file"
-msgstr ""
-
-#: ../app/tools/gimpcurvestool.c:180
-msgid "Save Curves"
-msgstr ""
+#: ../app/tools/gimpcurvestool.c:170
+#, fuzzy
+#| msgid "Import paths"
+msgid "Import Curves"
+msgstr "�ำ���า�ส���า�"
 
-#: ../app/tools/gimpcurvestool.c:181
-msgid "Save curves settings to file"
-msgstr ""
+#: ../app/tools/gimpcurvestool.c:171
+#, fuzzy
+#| msgid "Drag Curve"
+msgid "Export Curves"
+msgstr "ลา�ส�ว�����"
 
-#: ../app/tools/gimpcurvestool.c:258
+#: ../app/tools/gimpcurvestool.c:222
 #, fuzzy
 msgid "Curves does not operate on indexed layers."
 msgstr "�าร�ลั���าสี�ม�สามาร�����า�������ั���า�����ั��ีสี"
 
-#: ../app/tools/gimpcurvestool.c:362
+#: ../app/tools/gimpcurvestool.c:330
 #, fuzzy
 msgid "Click to add a control point"
 msgstr "����ื�อ�ลือ��ส���า��ี��ะ�����"
 
-#: ../app/tools/gimpcurvestool.c:367
+#: ../app/tools/gimpcurvestool.c:335
 #, fuzzy
 msgid "Click to add control points to all channels"
 msgstr "����ื�อ�ลือ��ส���า��ี��ะ�����"
 
-#: ../app/tools/gimpcurvestool.c:562 ../app/tools/gimplevelstool.c:371
+#: ../app/tools/gimpcurvestool.c:340
+msgid "Click to locate on curve (try Shift, Ctrl)"
+msgstr ""
+
+#: ../app/tools/gimpcurvestool.c:453 ../app/tools/gimplevelstool.c:384
 #, fuzzy
 msgid "Cha_nnel:"
 msgstr "�����ล:"
 
-#: ../app/tools/gimpcurvestool.c:584 ../app/tools/gimplevelstool.c:393
+#: ../app/tools/gimpcurvestool.c:479 ../app/tools/gimplevelstool.c:408
 #, fuzzy
 msgid "R_eset Channel"
 msgstr "�ลั_���า��ิม�����ล"
 
-#. Horizontal button box for load / save
-#: ../app/tools/gimpcurvestool.c:688 ../app/tools/gimplevelstool.c:587
-msgid "All Channels"
-msgstr "�����ล�ั��หม�"
+#: ../app/tools/gimpcurvestool.c:571 ../app/widgets/gimpdeviceinfoeditor.c:460
+msgid "Curve _type:"
+msgstr ""
 
-#. The radio box for selecting the curve type
-#: ../app/tools/gimpcurvestool.c:706
-msgid "Curve Type"
+#: ../app/tools/gimpcurvestool.c:646 ../app/tools/gimplevelstool.c:756
+#, fuzzy, c-format
+#| msgid "Could not read %d bytes from '%s': %s"
+msgid "Could not read header from '%s': %s"
+msgstr "�ม�สามาร�อ�า���� %d ���� �า� '%s': %s"
+
+#: ../app/tools/gimpcurvestool.c:719
+msgid "Use _old curves file format"
 msgstr ""
 
-#: ../app/tools/gimpcurvestool.c:760 ../app/tools/gimplevelstool.c:665
+#: ../app/tools/gimpdesaturatetool.c:78
 #, fuzzy
-msgid "not a GIMP Levels file"
-msgstr "�ม�������ม�ั�ว��"
+#| msgid "Turn colors into shades of gray"
+msgid "Desaturate Tool: Turn colors into shades of gray"
+msgstr "��ลี�ย���า�สี�ห�����ระ�ั�สี��า"
+
+#: ../app/tools/gimpdesaturatetool.c:79
+msgid "_Desaturate..."
+msgstr "_ล��วามอิ�มสี..."
 
-#: ../app/tools/gimpcurvestool.c:774 ../app/tools/gimplevelstool.c:704
+#: ../app/tools/gimpdesaturatetool.c:93
 #, fuzzy
-msgid "parse error"
-msgstr "��อ�ิ��ลา���"
+msgid "Desaturate (Remove Colors)"
+msgstr "�อา�����ลออ�"
 
-#: ../app/tools/gimpdodgeburntool.c:73
+#: ../app/tools/gimpdesaturatetool.c:124
+#, fuzzy
+#| msgid "Desaturate operates only on RGB color layers."
+msgid "Desaturate does only operate on RGB layers."
+msgstr "�ารล��วามอิ�มสี���������าะ�ั���า��ี����ระ��สี RGB"
+
+#: ../app/tools/gimpdesaturatetool.c:193
+msgid "Choose shade of gray based on:"
+msgstr "�ลือ�ระ�ั�สี��า�าม�า��อ�:"
+
+#: ../app/tools/gimpdodgeburntool.c:72
 msgid "Dodge / Burn"
 msgstr ""
 
-#: ../app/tools/gimpdodgeburntool.c:74
+#: ../app/tools/gimpdodgeburntool.c:73
 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush"
 msgstr ""
 
-#: ../app/tools/gimpdodgeburntool.c:75
+#: ../app/tools/gimpdodgeburntool.c:74
 msgid "Dod_ge / Burn"
 msgstr ""
 
-#: ../app/tools/gimpdodgeburntool.c:173
+#: ../app/tools/gimpdodgeburntool.c:172
 #, fuzzy
 msgid "Click to dodge"
 msgstr "����ื�อ�ลือ��ส���า��ี��ะ�����"
 
-#: ../app/tools/gimpdodgeburntool.c:174
+#: ../app/tools/gimpdodgeburntool.c:173
 #, fuzzy
 msgid "Click to dodge the line"
 msgstr "����ื�อ��ิ��ส���า�"
 
-#: ../app/tools/gimpdodgeburntool.c:175
+#: ../app/tools/gimpdodgeburntool.c:174
 #, c-format
 msgid "%s to burn"
 msgstr ""
 
-#: ../app/tools/gimpdodgeburntool.c:179
+#: ../app/tools/gimpdodgeburntool.c:178
 #, fuzzy
 msgid "Click to burn"
 msgstr "�ำ�ห�มัวหรือ�ม�ั�"
 
-#: ../app/tools/gimpdodgeburntool.c:180
+#: ../app/tools/gimpdodgeburntool.c:179
 #, fuzzy
 msgid "Click to burn the line"
 msgstr "����ื�อ��ิ��ส���า�"
 
-#: ../app/tools/gimpdodgeburntool.c:181
+#: ../app/tools/gimpdodgeburntool.c:180
 #, c-format
 msgid "%s to dodge"
 msgstr ""
 
 #. the type (dodge or burn)
-#: ../app/tools/gimpdodgeburntool.c:202
+#: ../app/tools/gimpdodgeburntool.c:201
 #, fuzzy, c-format
 msgid "Type  (%s)"
 msgstr "�ระ�ภ�  %s"
 
-#: ../app/tools/gimpdodgeburntool.c:214
-msgid "Mode"
-msgstr "ระ��"
+#. mode (highlights, midtones, or shadows)
+#: ../app/tools/gimpdodgeburntool.c:212
+#, fuzzy
+msgid "Range"
+msgstr "�ำลั�หมุ�..."
 
-#: ../app/tools/gimpdodgeburntool.c:226
+#: ../app/tools/gimpdodgeburntool.c:224
 msgid "Exposure:"
 msgstr ""
 
-#: ../app/tools/gimpeditselectiontool.c:237
-#: ../app/tools/gimpeditselectiontool.c:1184
+#: ../app/tools/gimpeditselectiontool.c:245
+#: ../app/tools/gimpeditselectiontool.c:1249
 msgid "Move Floating Selection"
 msgstr "�ลื�อ��ื���ี��ลือ�ลอย�ัว"
 
-#: ../app/tools/gimpeditselectiontool.c:439
-#: ../app/tools/gimpeditselectiontool.c:708
+#: ../app/tools/gimpeditselectiontool.c:464
+#: ../app/tools/gimpeditselectiontool.c:739
 msgid "Move: "
 msgstr "�ลื�อ�: "
 
-#: ../app/tools/gimpellipseselecttool.c:72
+#: ../app/tools/gimpellipseselecttool.c:68
 msgid "Ellipse Select"
 msgstr "ว�รี"
 
-#: ../app/tools/gimpellipseselecttool.c:73
+#: ../app/tools/gimpellipseselecttool.c:69
 #, fuzzy
 msgid "Ellipse Select Tool: Select an elliptical region"
 msgstr "�ลือ��ื���ี�ว�รี"
 
-#: ../app/tools/gimpellipseselecttool.c:74
+#: ../app/tools/gimpellipseselecttool.c:70
 msgid "_Ellipse Select"
 msgstr "_ว�รี/�ลม"
 
-#: ../app/tools/gimperasertool.c:67
+#: ../app/tools/gimperasertool.c:66
 #, fuzzy
 msgid "Eraser Tool: Erase to background or transparency using a brush"
 msgstr "ล�����สี�ิ��หลั�หรือ��ร���ส"
 
-#: ../app/tools/gimperasertool.c:68
+#: ../app/tools/gimperasertool.c:67
 msgid "_Eraser"
 msgstr "_ยา�ล�"
 
-#: ../app/tools/gimperasertool.c:97
+#: ../app/tools/gimperasertool.c:96
 #, fuzzy
 msgid "Click to erase"
 msgstr "ล�สี"
 
-#: ../app/tools/gimperasertool.c:98
+#: ../app/tools/gimperasertool.c:97
 #, fuzzy
 msgid "Click to erase the line"
 msgstr "����ื�อสร�า��าร�ส���ัวอย�า�"
 
-#: ../app/tools/gimperasertool.c:99
+#: ../app/tools/gimperasertool.c:98
 #, fuzzy, c-format
 msgid "%s to pick a background color"
 msgstr "��ลี�ย��ี�สี�ื��หลั�"
 
 #. the anti_erase toggle
-#: ../app/tools/gimperasertool.c:146
+#: ../app/tools/gimperasertool.c:145
 #, fuzzy, c-format
 msgid "Anti erase  (%s)"
 msgstr "�ื��ารล�  %s"
 
-#: ../app/tools/gimpflipoptions.c:129 ../app/tools/gimpmoveoptions.c:178
-#: ../app/tools/gimptransformoptions.c:281
+#: ../app/tools/gimpflipoptions.c:129
 msgid "Affect:"
 msgstr "มี�ล��อ:"
 
 #. tool toggle
-#: ../app/tools/gimpflipoptions.c:135
+#: ../app/tools/gimpflipoptions.c:138
 #, fuzzy, c-format
 msgid "Flip Type  (%s)"
 msgstr "รู�����าร�ลั���า� %s"
 
-#: ../app/tools/gimpfliptool.c:77
+#: ../app/tools/gimpfliptool.c:79
 msgid "Flip"
 msgstr "�ลั���า�"
 
-#: ../app/tools/gimpfliptool.c:78
-msgid "Flip Tool: Reverse the layer horizontally or vertically"
+#: ../app/tools/gimpfliptool.c:80
+msgid ""
+"Flip Tool: Reverse the layer, selection or path horizontally or vertically"
 msgstr ""
 
-#: ../app/tools/gimpfliptool.c:79
+#: ../app/tools/gimpfliptool.c:82
 msgid "_Flip"
 msgstr "_�ลั���า�"
 
-#: ../app/tools/gimpforegroundselectoptions.c:77
+#: ../app/tools/gimpforegroundselectoptions.c:78
+#: ../app/tools/gimpselectionoptions.c:78
+msgid "Smooth edges"
+msgstr "�อ��รีย�"
+
+#: ../app/tools/gimpforegroundselectoptions.c:84
 #, fuzzy
 msgid "Select a single contiguous area"
 msgstr "�ลือ��ื���ี��ี��ิ��ั�"
 
-#: ../app/tools/gimpforegroundselectoptions.c:86
+#: ../app/tools/gimpforegroundselectoptions.c:95
 msgid "Size of the brush used for refinements"
 msgstr ""
 
-#: ../app/tools/gimpforegroundselectoptions.c:91
+#: ../app/tools/gimpforegroundselectoptions.c:101
 msgid ""
 "Smaller values give a more accurate selection border but may introduce holes "
 "in the selection"
 msgstr ""
 
-#: ../app/tools/gimpforegroundselectoptions.c:107
+#: ../app/tools/gimpforegroundselectoptions.c:120
 msgid "Sensitivity for brightness component"
 msgstr ""
 
-#: ../app/tools/gimpforegroundselectoptions.c:112
+#: ../app/tools/gimpforegroundselectoptions.c:126
 msgid "Sensitivity for red/green component"
 msgstr ""
 
-#: ../app/tools/gimpforegroundselectoptions.c:117
+#: ../app/tools/gimpforegroundselectoptions.c:132
 msgid "Sensitivity for yellow/blue component"
 msgstr ""
 
 #. single / multiple objects
-#: ../app/tools/gimpforegroundselectoptions.c:231
+#: ../app/tools/gimpforegroundselectoptions.c:275
 #, fuzzy
 msgid "Contiguous"
 msgstr "��อ��"
 
 #. foreground / background
-#: ../app/tools/gimpforegroundselectoptions.c:236
+#: ../app/tools/gimpforegroundselectoptions.c:280
 #, c-format
 msgid "Interactive refinement  (%s)"
 msgstr ""
 
-#: ../app/tools/gimpforegroundselectoptions.c:240
+#: ../app/tools/gimpforegroundselectoptions.c:284
 #, fuzzy
 msgid "Mark background"
 msgstr "�ื��หลั�"
 
-#: ../app/tools/gimpforegroundselectoptions.c:241
+#: ../app/tools/gimpforegroundselectoptions.c:285
 #, fuzzy
 msgid "Mark foreground"
 msgstr "�ื��ห��า"
 
-#: ../app/tools/gimpforegroundselectoptions.c:257
+#: ../app/tools/gimpforegroundselectoptions.c:301
 #, fuzzy
 msgid "Small brush"
 msgstr "�ล��"
 
-#: ../app/tools/gimpforegroundselectoptions.c:265
+#: ../app/tools/gimpforegroundselectoptions.c:309
 #, fuzzy
 msgid "Large brush"
 msgstr "หัว��ร��หม�"
 
-#: ../app/tools/gimpforegroundselectoptions.c:289
+#: ../app/tools/gimpforegroundselectoptions.c:333
 #, fuzzy
 msgid "Smoothing:"
 msgstr "�รีย�"
 
-#: ../app/tools/gimpforegroundselectoptions.c:295
+#: ../app/tools/gimpforegroundselectoptions.c:339
 #, fuzzy
 msgid "Preview color:"
 msgstr "�ู�ัวอย�า�:"
 
 #. granularity
-#: ../app/tools/gimpforegroundselectoptions.c:298
+#: ../app/tools/gimpforegroundselectoptions.c:342
 #, fuzzy
 msgid "Color Sensitivity"
 msgstr "��ิ�ิริยา�อ�ส�อ�"
 
-#: ../app/tools/gimpforegroundselecttool.c:143
+#: ../app/tools/gimpforegroundselecttool.c:146
 #, fuzzy
 msgid "Foreground Select"
 msgstr "�ื��ห��า"
 
-#: ../app/tools/gimpforegroundselecttool.c:144
+#: ../app/tools/gimpforegroundselecttool.c:147
 msgid "Foreground Select Tool: Select a region containing foreground objects"
 msgstr ""
 
-#: ../app/tools/gimpforegroundselecttool.c:145
+#: ../app/tools/gimpforegroundselecttool.c:148
 #, fuzzy
 msgid "F_oreground Select"
 msgstr "�ื��ห��า"
 
-#: ../app/tools/gimpforegroundselecttool.c:305
+#: ../app/tools/gimpforegroundselecttool.c:315
 msgid "Add more strokes or press Enter to accept the selection"
 msgstr ""
 
-#: ../app/tools/gimpforegroundselecttool.c:307
+#: ../app/tools/gimpforegroundselecttool.c:317
 msgid "Mark foreground by painting on the object to extract"
 msgstr ""
 
-#: ../app/tools/gimpforegroundselecttool.c:321
-msgid "Draw a rough circle around the object to extract"
+#: ../app/tools/gimpforegroundselecttool.c:328
+msgid "Roughly outline the object to extract"
 msgstr ""
 
-#: ../app/tools/gimpforegroundselecttool.c:744
+#: ../app/tools/gimpforegroundselecttool.c:769
 #, fuzzy
-msgid "command|Foreground Select"
+msgctxt "command"
+msgid "Foreground Select"
 msgstr "�ื��ห��า"
 
-#: ../app/tools/gimpfreeselecttool.c:96
+#: ../app/tools/gimpfreeselecttool.c:199
 #, fuzzy
-msgid "Free Select Tool: Select a hand-drawn region"
+msgid ""
+"Free Select Tool: Select a hand-drawn region with free and polygonal segments"
 msgstr "�ลือ��ื���ี���วยมือ"
 
-#: ../app/tools/gimpfreeselecttool.c:97
+#: ../app/tools/gimpfreeselecttool.c:200
 msgid "_Free Select"
 msgstr "�_ลือ�อิสระ"
 
-#: ../app/tools/gimpfreeselecttool.c:307
+#: ../app/tools/gimpfreeselecttool.c:1119
+#, fuzzy
+msgid "Click to complete selection"
+msgstr "����ื�อสร�า��ส���า��หม�"
+
+#: ../app/tools/gimpfreeselecttool.c:1123
+#, fuzzy
+msgid "Click-Drag to move segment vertex"
+msgstr "���ล�วลา���ื�อ�ลื�อ��ส���า�รอ��"
+
+#: ../app/tools/gimpfreeselecttool.c:1128
+msgid "Return commits, Escape cancels, Backspace removes last segment"
+msgstr ""
+
+#: ../app/tools/gimpfreeselecttool.c:1132
+msgid "Click-Drag adds a free segment, Click adds a polygonal segment"
+msgstr ""
+
+#: ../app/tools/gimpfreeselecttool.c:1625
 #, fuzzy
-msgid "command|Free Select"
+#| msgid "Free Select"
+msgctxt "command"
+msgid "Free Select"
 msgstr "�ลือ�อิสระ"
 
-#: ../app/tools/gimpfuzzyselecttool.c:63
+#: ../app/tools/gimpfuzzyselecttool.c:65
 msgid "Fuzzy Select"
 msgstr "�ลือ�สุ�มสี"
 
-#: ../app/tools/gimpfuzzyselecttool.c:64
+#: ../app/tools/gimpfuzzyselecttool.c:66
 msgid "Fuzzy Select Tool: Select a contiguous region on the basis of color"
 msgstr ""
 
-#: ../app/tools/gimpfuzzyselecttool.c:65
+#: ../app/tools/gimpfuzzyselecttool.c:67
 msgid "Fu_zzy Select"
 msgstr "สุ�_มสี"
 
-#: ../app/tools/gimphealtool.c:58
+#: ../app/tools/gimpgegltool.c:93 ../app/tools/gimpgegltool.c:112
+msgid "GEGL Operation"
+msgstr ""
+
+#: ../app/tools/gimpgegltool.c:94
+msgid "GEGL Tool: Use an arbitrary GEGL operation"
+msgstr ""
+
+#: ../app/tools/gimpgegltool.c:95
+#, fuzzy
+#| msgid "Open _Location..."
+msgid "_GEGL Operation..."
+msgstr "��ิ�_�ำ�ห���..."
+
+#: ../app/tools/gimpgegltool.c:160
+#, fuzzy
+msgid "GEGL operations do not operate on indexed layers."
+msgstr "�าร��ลี�ย�ห����า�ั��ม�สามาร��������ั��ั���า�����ั��ีสี"
+
+#: ../app/tools/gimpgegltool.c:371
+#, fuzzy
+#| msgid "Open Location"
+msgid "_Operation:"
+msgstr "��ิ��า��ำ�ห���"
+
+#. The options vbox
+#: ../app/tools/gimpgegltool.c:430
+msgid "Operation Settings"
+msgstr ""
+
+#: ../app/tools/gimpgegltool.c:435
+#, fuzzy
+#| msgid "Remove all operations from the undo history"
+msgid "Select an operation from the list above"
+msgstr "ล�ราย�าร�ระวั�ิ�าร�รีย��ื��ั��หม��อ�ภา����หรือ�ม�?"
+
+#: ../app/tools/gimphealtool.c:53
 msgid "Healing Tool: Heal image irregularities"
 msgstr ""
 
-#: ../app/tools/gimphealtool.c:59
+#: ../app/tools/gimphealtool.c:54
 #, fuzzy
 msgid "_Heal"
 msgstr "_��วย�หลือ"
 
-#: ../app/tools/gimphealtool.c:81 ../app/tools/gimphealtool.c:84
+#: ../app/tools/gimphealtool.c:76 ../app/tools/gimphealtool.c:79
 #, fuzzy
 msgid "Click to heal"
 msgstr "ล�สี"
 
-#: ../app/tools/gimphealtool.c:82 ../app/tools/gimphealtool.c:86
+#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:81
 #, fuzzy, c-format
 msgid "%s to set a new heal source"
 msgstr "����ื�อสร�า��ส���า��หม�"
 
-#: ../app/tools/gimphealtool.c:85
+#: ../app/tools/gimphealtool.c:80
 #, fuzzy
 msgid "Click to set a new heal source"
 msgstr "����ื�อสร�า��ส���า��หม�"
 
-#: ../app/tools/gimphistogramoptions.c:124
+#: ../app/tools/gimphistogramoptions.c:126
 msgid "Histogram Scale"
 msgstr "อั�รา�วาม�ี�สีภา�"
 
-#: ../app/tools/gimphuesaturationtool.c:114
+#: ../app/tools/gimphuesaturationtool.c:103
 msgid "Hue-Saturation Tool: Adjust hue, saturation, and lightness"
 msgstr ""
 
-#: ../app/tools/gimphuesaturationtool.c:115
+#: ../app/tools/gimphuesaturationtool.c:104
 msgid "Hue-_Saturation..."
 msgstr "�า�ุสี-�วาม_อิ�มสี"
 
-#: ../app/tools/gimphuesaturationtool.c:132
+#: ../app/tools/gimphuesaturationtool.c:121
 #, fuzzy
 msgid "Adjust Hue / Lightness / Saturation"
 msgstr "�รั���า�า�ุสี / �วามสว�า� / �วามอิ�มสี"
 
-#: ../app/tools/gimphuesaturationtool.c:178
+#: ../app/tools/gimphuesaturationtool.c:123
+#, fuzzy
+#| msgid "Hue-Saturation"
+msgid "Import Hue-Saturation Settings"
+msgstr "�า�ุสี-�วามอิ�มสี"
+
+#: ../app/tools/gimphuesaturationtool.c:124
+#, fuzzy
+#| msgid "Hue-Saturation"
+msgid "Export Hue-Saturation Settings"
+msgstr "�า�ุสี-�วามอิ�มสี"
+
+#: ../app/tools/gimphuesaturationtool.c:170
 msgid "Hue-Saturation operates only on RGB color layers."
 msgstr "�ำสั���า�ุสี-�วามอิ�มสี�ำ�า����ั���า���� RGB ���า�ั��"
 
-#: ../app/tools/gimphuesaturationtool.c:234
+#: ../app/tools/gimphuesaturationtool.c:248
 msgid "M_aster"
 msgstr ""
 
-#: ../app/tools/gimphuesaturationtool.c:234
+#: ../app/tools/gimphuesaturationtool.c:248
 #, fuzzy
 msgid "Adjust all colors"
 msgstr "�����สี�ั��หม�"
 
-#: ../app/tools/gimphuesaturationtool.c:235
+#: ../app/tools/gimphuesaturationtool.c:249
 msgid "_R"
 msgstr "_R"
 
-#: ../app/tools/gimphuesaturationtool.c:236
+#: ../app/tools/gimphuesaturationtool.c:250
 msgid "_Y"
 msgstr "_Y"
 
-#: ../app/tools/gimphuesaturationtool.c:237
+#: ../app/tools/gimphuesaturationtool.c:251
 msgid "_G"
 msgstr "_G"
 
-#: ../app/tools/gimphuesaturationtool.c:238
+#: ../app/tools/gimphuesaturationtool.c:252
 msgid "_C"
 msgstr "_C"
 
-#: ../app/tools/gimphuesaturationtool.c:239
+#: ../app/tools/gimphuesaturationtool.c:253
 msgid "_B"
 msgstr "_B"
 
-#: ../app/tools/gimphuesaturationtool.c:240
+#: ../app/tools/gimphuesaturationtool.c:254
 msgid "_M"
 msgstr "_M"
 
-#: ../app/tools/gimphuesaturationtool.c:243
+#: ../app/tools/gimphuesaturationtool.c:259
 #, fuzzy
 msgid "Select Primary Color to Adjust"
 msgstr "�ลือ�สีหลั���ื�อ�ำ�าร�����"
 
-#: ../app/tools/gimphuesaturationtool.c:331
+#: ../app/tools/gimphuesaturationtool.c:349
 msgid "_Overlap:"
 msgstr ""
 
-#: ../app/tools/gimphuesaturationtool.c:349
+#: ../app/tools/gimphuesaturationtool.c:368
 #, fuzzy
 msgid "Adjust Selected Color"
 msgstr "�����สี�ี��ลือ��ว�"
 
-#: ../app/tools/gimphuesaturationtool.c:423
+#: ../app/tools/gimphuesaturationtool.c:444
 #, fuzzy
 msgid "R_eset Color"
 msgstr "�ั����าสี�หม�"
 
-#: ../app/tools/gimpimagemaptool.c:233
-msgid "_Preview"
-msgstr "_�ส���ล"
+#: ../app/tools/gimpimagemaptool-settings.c:80
+#, fuzzy
+#| msgid "Pressure:"
+msgid "Pre_sets:"
+msgstr "�ร��ั�:"
 
-#: ../app/tools/gimpimagemaptool.c:265
-msgid "Quick Load"
-msgstr "�หล�อย�า��ร�ว"
+#: ../app/tools/gimpimagemaptool-settings.c:222
+#, fuzzy, c-format
+msgid "Settings saved to '%s'"
+msgstr "ราย�าร��รื�อ�มือ������าร�ลือ��ื���ี�"
 
-#: ../app/tools/gimpimagemaptool.c:294
-msgid "Quick Save"
-msgstr "�ั��ึ�อย�า��ร�ว"
+#: ../app/tools/gimpimagemaptool.c:367
+msgid "_Preview"
+msgstr "_�ส���ล"
 
 #. adjust sliders
-#: ../app/tools/gimpinkoptions-gui.c:56
+#: ../app/tools/gimpinkoptions-gui.c:55
 msgid "Adjustment"
 msgstr "�าร�รั���า"
 
-#: ../app/tools/gimpinkoptions-gui.c:68 ../app/tools/gimpinkoptions-gui.c:93
-#: ../app/tools/gimptextoptions.c:436
+#: ../app/tools/gimpinkoptions-gui.c:67 ../app/tools/gimpinkoptions-gui.c:92
+#: ../app/tools/gimprectangleoptions.c:972 ../app/tools/gimptextoptions.c:471
 msgid "Size:"
 msgstr "��า�:"
 
-#: ../app/tools/gimpinkoptions-gui.c:76 ../app/tools/gimpmeasuretool.c:962
-#: ../app/tools/gimprotatetool.c:144 ../app/widgets/gimpbrusheditor.c:208
+#: ../app/tools/gimpinkoptions-gui.c:75 ../app/tools/gimpmeasuretool.c:1046
+#: ../app/tools/gimppaintoptions-gui.c:137
+#: ../app/widgets/gimpbrusheditor.c:207
 msgid "Angle:"
 msgstr "มุม:"
 
 #. sens sliders
-#: ../app/tools/gimpinkoptions-gui.c:81
+#: ../app/tools/gimpinkoptions-gui.c:80
 msgid "Sensitivity"
 msgstr "��ิ�ิริยา�อ�ส�อ�"
 
-#: ../app/tools/gimpinkoptions-gui.c:100
+#: ../app/tools/gimpinkoptions-gui.c:99
 msgid "Tilt:"
 msgstr "�อีย�:"
 
-#: ../app/tools/gimpinkoptions-gui.c:107
+#: ../app/tools/gimpinkoptions-gui.c:106
 msgid "Speed:"
 msgstr "�วาม�ร�ว:"
 
-#: ../app/tools/gimpinkoptions-gui.c:118
+#: ../app/tools/gimpinkoptions-gui.c:117
 msgid "Type"
 msgstr "�ระ�ภ�"
 
@@ -9509,668 +13934,786 @@ msgstr "�ระ�ภ�"
 msgid "Shape"
 msgstr "รู��ร�"
 
-#: ../app/tools/gimpinktool.c:56
+#: ../app/tools/gimpinktool.c:55
 msgid "Ink Tool: Calligraphy-style painting"
 msgstr ""
 
-#: ../app/tools/gimpinktool.c:57
+#: ../app/tools/gimpinktool.c:56
 msgid "In_k"
 msgstr "��ำ_หมื�"
 
-#: ../app/tools/gimpiscissorstool.c:272
+#: ../app/tools/gimpiscissorsoptions.c:125
+#, fuzzy
+#| msgid "Show interactive boundary"
+msgid "Interactive boundary"
+msgstr "�ส���อ�����ี��ำ�า�"
+
+#: ../app/tools/gimpiscissorstool.c:279
 msgid "Scissors"
 msgstr "�รร��ร"
 
-#: ../app/tools/gimpiscissorstool.c:273
+#: ../app/tools/gimpiscissorstool.c:280
 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting"
 msgstr ""
 
-#: ../app/tools/gimpiscissorstool.c:274
+#: ../app/tools/gimpiscissorstool.c:281
 msgid "Intelligent _Scissors"
 msgstr "�รร��_รอั��ริยะ"
 
-#: ../app/tools/gimplevelstool.c:155
-msgid "Levels Tool: Adjust color levels"
-msgstr ""
+#: ../app/tools/gimpiscissorstool.c:938 ../app/tools/gimpmeasuretool.c:617
+#, fuzzy
+msgid "Click-Drag to move this point"
+msgstr "���ล�วลา���ื�อ�ลื�อ��ส���า�รอ��"
 
-#: ../app/tools/gimplevelstool.c:156
-msgid "_Levels..."
+#: ../app/tools/gimpiscissorstool.c:940 ../app/tools/gimpiscissorstool.c:1005
+#, c-format
+msgid "%s: disable auto-snap"
 msgstr ""
 
-#: ../app/tools/gimplevelstool.c:178
-msgid "Load Levels"
-msgstr ""
+#: ../app/tools/gimpiscissorstool.c:957
+#, fuzzy
+#| msgid "Click to create preview"
+msgid "Click to close the curve"
+msgstr "����ื�อสร�า��าร�ส���ัวอย�า�"
+
+#: ../app/tools/gimpiscissorstool.c:963
+#, fuzzy
+msgid "Click to add a point on this segment"
+msgstr "����ื�อ�ลือ��ส���า��ี��ะ�����"
 
-#: ../app/tools/gimplevelstool.c:179
-msgid "Load levels settings from file"
+#: ../app/tools/gimpiscissorstool.c:977
+#, fuzzy
+msgid "Click or press Enter to convert to a selection"
+msgstr "����ื�อล��ุ�สมอ�ี�"
+
+#: ../app/tools/gimpiscissorstool.c:987
+msgid "Press Enter to convert to a selection"
 msgstr ""
 
-#: ../app/tools/gimplevelstool.c:180
-msgid "Save Levels"
+#: ../app/tools/gimpiscissorstool.c:1002
+#, fuzzy
+msgid "Click or Click-Drag to add a point"
+msgstr "����ื�อ�ลือ��ส���า��ี��ะ�����"
+
+#: ../app/tools/gimplevelstool.c:151
+msgid "Levels Tool: Adjust color levels"
 msgstr ""
 
-#: ../app/tools/gimplevelstool.c:181
-msgid "Save levels settings to file"
+#: ../app/tools/gimplevelstool.c:152
+msgid "_Levels..."
 msgstr ""
 
-#: ../app/tools/gimplevelstool.c:242
+#: ../app/tools/gimplevelstool.c:174
+#, fuzzy
+#| msgid "Import palette"
+msgid "Import Levels"
+msgstr "�ำ���า�า�สี"
+
+#: ../app/tools/gimplevelstool.c:175
+#, fuzzy
+#| msgid "Levels"
+msgid "Export Levels"
+msgstr "ระ�ั���า��"
+
+#: ../app/tools/gimplevelstool.c:229
 #, fuzzy
 msgid "Levels does not operate on indexed layers."
 msgstr "�าร�ลั���าสี�ม�สามาร�����า�������ั���า�����ั��ีสี"
 
-#: ../app/tools/gimplevelstool.c:309
+#: ../app/tools/gimplevelstool.c:314
 msgid "Pick black point"
 msgstr "�����ุ��ี�ว�า�"
 
-#: ../app/tools/gimplevelstool.c:313
+#: ../app/tools/gimplevelstool.c:318
 msgid "Pick gray point"
 msgstr "�����ุ�สี��า"
 
-#: ../app/tools/gimplevelstool.c:317
+#: ../app/tools/gimplevelstool.c:322
 msgid "Pick white point"
 msgstr "�����ุ�สี�าว"
 
 #. Input levels frame
-#: ../app/tools/gimplevelstool.c:408
+#: ../app/tools/gimplevelstool.c:423
 msgid "Input Levels"
 msgstr ""
 
-#: ../app/tools/gimplevelstool.c:495
+#: ../app/tools/gimplevelstool.c:526
 msgid "Gamma"
 msgstr ""
 
 #. Output levels frame
-#: ../app/tools/gimplevelstool.c:522
+#: ../app/tools/gimplevelstool.c:568
 msgid "Output Levels"
 msgstr ""
 
-#: ../app/tools/gimplevelstool.c:614
+#. all channels frame
+#: ../app/tools/gimplevelstool.c:645
+msgid "All Channels"
+msgstr "�����ล�ั��หม�"
+
+#: ../app/tools/gimplevelstool.c:657 ../app/tools/gimpthresholdtool.c:268
+msgid "_Auto"
+msgstr "_อั���มั�ิ"
+
+#: ../app/tools/gimplevelstool.c:659
 msgid "Adjust levels automatically"
 msgstr ""
 
-#: ../app/tools/gimpmagnifyoptions.c:175
+#: ../app/tools/gimplevelstool.c:686
+msgid "Edit these Settings as Curves"
+msgstr ""
+
+#: ../app/tools/gimplevelstool.c:829
+msgid "Use _old levels file format"
+msgstr ""
+
+#: ../app/tools/gimpmagnifyoptions.c:166
 msgid "Auto-resize window"
 msgstr "�รั���า�ห��า��า�อั���มั�ิ"
 
 #. tool toggle
-#: ../app/tools/gimpmagnifyoptions.c:180 ../app/tools/gimpmoveoptions.c:184
+#: ../app/tools/gimpmagnifyoptions.c:171 ../app/tools/gimpmoveoptions.c:187
 #, fuzzy, c-format
 msgid "Tool Toggle  (%s)"
 msgstr "สลั���รื�อ�มือ  %s"
 
-#: ../app/tools/gimpmagnifytool.c:91
+#: ../app/tools/gimpmagnifytool.c:87
 #, fuzzy
 msgid "Zoom"
 msgstr "ย�อ-�ยาย:"
 
-#: ../app/tools/gimpmagnifytool.c:92
+#: ../app/tools/gimpmagnifytool.c:88
 msgid "Zoom Tool: Adjust the zoom level"
 msgstr ""
 
-#: ../app/tools/gimpmagnifytool.c:93
+#: ../app/tools/gimpmagnifytool.c:89
 #, fuzzy
-msgid "tool|_Zoom"
+#| msgid "_Zoom"
+msgctxt "tool"
+msgid "_Zoom"
 msgstr "_ย�อ�ยาย"
 
-#: ../app/tools/gimpmeasureoptions.c:124
+#: ../app/tools/gimpmeasureoptions.c:123
 msgid "Use info window"
 msgstr "���ห��า��า���อมูล"
 
-#: ../app/tools/gimpmeasuretool.c:121
+#: ../app/tools/gimpmeasuretool.c:123
 msgid "Measure"
 msgstr "วั���า"
 
-#: ../app/tools/gimpmeasuretool.c:122
+#: ../app/tools/gimpmeasuretool.c:124
 #, fuzzy
 msgid "Measure Tool: Measure distances and angles"
 msgstr "วั�ระยะ�ละมุม"
 
-#: ../app/tools/gimpmeasuretool.c:123
+#: ../app/tools/gimpmeasuretool.c:125
 msgid "_Measure"
 msgstr "_วั���า"
 
-#: ../app/tools/gimpmeasuretool.c:238
+#: ../app/tools/gimpmeasuretool.c:245
 msgid "Add Guides"
 msgstr "��ิ�ม�ส���ำ��ว"
 
+#: ../app/tools/gimpmeasuretool.c:568
+msgid "Click to place vertical and horizontal guides"
+msgstr ""
+
+#: ../app/tools/gimpmeasuretool.c:577
+#, fuzzy
+#| msgid "Pick a layer or guide"
+msgid "Click to place a horizontal guide"
+msgstr "�����ั���า�หรือ�ส���ำ��ว"
+
+#: ../app/tools/gimpmeasuretool.c:592
+#, fuzzy
+msgid "Click to place a vertical guide"
+msgstr "����ื�อสร�า��ส���า��หม�"
+
+#: ../app/tools/gimpmeasuretool.c:606
+#, fuzzy
+msgid "Click-Drag to add a new point"
+msgstr "����ื�อ�ลือ��ส���า��ี��ะ�����"
+
+#: ../app/tools/gimpmeasuretool.c:637
+#, fuzzy
+msgid "Click-Drag to move all points"
+msgstr "���ล�วลา���ื�อ�ลื�อ��ุ�สมอรอ��"
+
+#: ../app/tools/gimpmeasuretool.c:884 ../app/tools/gimpmeasuretool.c:1029
+#: ../app/tools/gimpmeasuretool.c:1085 ../app/tools/gimpmeasuretool.c:1113
+#: ../app/tools/gimppainttool.c:643
+msgid "pixels"
+msgstr "�ุ�ภา�"
+
 #. tool->display->shell
-#: ../app/tools/gimpmeasuretool.c:916
+#: ../app/tools/gimpmeasuretool.c:997
 msgid "Measure Distances and Angles"
 msgstr "วั�ระยะ�ละมุม��า��"
 
-#: ../app/tools/gimpmeasuretool.c:936
+#: ../app/tools/gimpmeasuretool.c:1018
 msgid "Distance:"
 msgstr "ระยะ:"
 
-#: ../app/tools/gimpmoveoptions.c:140
+#: ../app/tools/gimpmoveoptions.c:139
 msgid "Pick a layer or guide"
 msgstr "�����ั���า�หรือ�ส���ำ��ว"
 
-#: ../app/tools/gimpmoveoptions.c:141
+#: ../app/tools/gimpmoveoptions.c:140
 #, fuzzy
 msgid "Move the active layer"
 msgstr "�ลื�อ��ั���า��ั��ุ�ั�"
 
-#: ../app/tools/gimpmoveoptions.c:145
+#: ../app/tools/gimpmoveoptions.c:144
 msgid "Move selection"
 msgstr "�ลื�อ��ื���ี��ลือ�"
 
-#: ../app/tools/gimpmoveoptions.c:149
+#: ../app/tools/gimpmoveoptions.c:148
 msgid "Pick a path"
 msgstr "�����ส���า�"
 
-#: ../app/tools/gimpmoveoptions.c:150
+#: ../app/tools/gimpmoveoptions.c:149
 #, fuzzy
 msgid "Move the active path"
 msgstr "ส��ออ���อมูล�ส���า��ี��ลือ�อยู�"
 
-#: ../app/tools/gimpmovetool.c:117
+#: ../app/tools/gimpmoveoptions.c:178
+#, fuzzy
+#| msgid "Move: "
+msgid "Move:"
+msgstr "�ลื�อ�: "
+
+#: ../app/tools/gimpmovetool.c:129
 #, fuzzy
-msgid "tool|Move"
+#| msgid "Move"
+msgctxt "tool"
+msgid "Move"
 msgstr "�ลื�อ�"
 
-#: ../app/tools/gimpmovetool.c:118
+#: ../app/tools/gimpmovetool.c:130
 msgid "Move Tool: Move layers, selections, and other objects"
 msgstr ""
 
-#: ../app/tools/gimpmovetool.c:119
+#: ../app/tools/gimpmovetool.c:131
 msgid "_Move"
 msgstr "�_ลื�อ�"
 
-#: ../app/tools/gimpmovetool.c:267 ../app/tools/gimpmovetool.c:544
+#: ../app/tools/gimpmovetool.c:277 ../app/tools/gimpmovetool.c:569
 msgid "Move Guide: "
 msgstr "�ลื�อ��ส���ำ��ว"
 
-#: ../app/tools/gimpmovetool.c:538
+#: ../app/tools/gimpmovetool.c:563
 msgid "Cancel Guide"
 msgstr "ย��ลิ��ส���ำ��ว"
 
-#: ../app/tools/gimpmovetool.c:544
+#: ../app/tools/gimpmovetool.c:569
 msgid "Add Guide: "
 msgstr "��ิ�ม�ส���ำ��ว"
 
-#: ../app/tools/gimppaintbrushtool.c:52
+#: ../app/tools/gimppaintbrushtool.c:51
 msgid "Paintbrush Tool: Paint smooth strokes using a brush"
 msgstr ""
 
-#: ../app/tools/gimppaintbrushtool.c:53
+#: ../app/tools/gimppaintbrushtool.c:52
 msgid "_Paintbrush"
 msgstr "�_�ร�"
 
-#: ../app/tools/gimppaintoptions-gui.c:104
-#: ../app/tools/gimpselectionoptions.c:335
-#: ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:272
+#: ../app/tools/gimppaintoptions-gui.c:90
+#: ../app/tools/gimpselectionoptions.c:210
+#: ../app/widgets/gimpbrushselect.c:193 ../app/widgets/gimplayertreeview.c:283
 msgid "Mode:"
 msgstr "ระ��:"
 
-#: ../app/tools/gimppaintoptions-gui.c:119
-#: ../app/widgets/gimpbrushselect.c:177 ../app/widgets/gimplayertreeview.c:287
+#: ../app/tools/gimppaintoptions-gui.c:105
+#: ../app/tools/gimptransformoptions.c:347
+#: ../app/widgets/gimpbrushselect.c:180 ../app/widgets/gimplayertreeview.c:306
 msgid "Opacity:"
 msgstr "�วาม�ึ��ส�:"
 
-#: ../app/tools/gimppaintoptions-gui.c:129
+#: ../app/tools/gimppaintoptions-gui.c:118
 msgid "Brush:"
 msgstr "หัว��ร�:"
 
-#: ../app/tools/gimppaintoptions-gui.c:141
-#: ../app/tools/gimppaintoptions-gui.c:463
-msgid "Gradient:"
-msgstr "สี�ร��า:"
+#: ../app/tools/gimppaintoptions-gui.c:123
+#, fuzzy
+#| msgid "Scale"
+msgid "Scale:"
+msgstr "�รั�สั�ส�ว�"
+
+#: ../app/tools/gimppaintoptions-gui.c:130
+#, fuzzy
+#| msgid "Aspect ratio:"
+msgid "Aspect Ratio:"
+msgstr "สั�ส�ว�:"
 
-#: ../app/tools/gimppaintoptions-gui.c:177
+#: ../app/tools/gimppaintoptions-gui.c:162
 msgid "Incremental"
 msgstr "��ิ�ม��า�"
 
-#: ../app/tools/gimppaintoptions-gui.c:193
+#: ../app/tools/gimppaintoptions-gui.c:178
 msgid "Hard edge"
 msgstr "�อ����ม"
 
-#: ../app/tools/gimppaintoptions-gui.c:229
-msgid "Pressure sensitivity"
-msgstr "�วาม�ว��อ�ร���"
-
-#: ../app/tools/gimppaintoptions-gui.c:250
-msgid "Opacity"
-msgstr "�วาม�ึ��ส�"
-
-#: ../app/tools/gimppaintoptions-gui.c:266
-msgid "Hardness"
-msgstr ""
-
-#: ../app/tools/gimppaintoptions-gui.c:277
-msgid "Rate"
-msgstr ""
-
-#: ../app/tools/gimppaintoptions-gui.c:293
-#: ../app/tools/gimppaintoptions-gui.c:302
-msgid "Size"
-msgstr "��า�"
-
-#: ../app/tools/gimppaintoptions-gui.c:337
+#: ../app/tools/gimppaintoptions-gui.c:212
 msgid "Fade out"
 msgstr "�า�ล�"
 
-#: ../app/tools/gimppaintoptions-gui.c:357
-#: ../app/tools/gimppaintoptions-gui.c:472
+#: ../app/tools/gimppaintoptions-gui.c:221
 msgid "Length:"
 msgstr "�วามยาว:"
 
-#: ../app/tools/gimppaintoptions-gui.c:389
+#: ../app/tools/gimppaintoptions-gui.c:241
+#: ../app/widgets/gimpviewablebox.c:223
+msgid "Reverse"
+msgstr "�ลิ�"
+
+#: ../app/tools/gimppaintoptions-gui.c:261
 msgid "Apply Jitter"
 msgstr ""
 
-#: ../app/tools/gimppaintoptions-gui.c:406
+#: ../app/tools/gimppaintoptions-gui.c:266
 #, fuzzy
 msgid "Amount:"
 msgstr "���อั�ษร:"
 
-#: ../app/tools/gimppaintoptions-gui.c:434
+#: ../app/tools/gimppaintoptions-gui.c:288
 msgid "Use color from gradient"
 msgstr "���สี�า�สี�ร��า"
 
-#: ../app/tools/gimppainttool.c:130
+#: ../app/tools/gimppainttool.c:142
 #, fuzzy
 msgid "Click to paint"
 msgstr "����ื�อ�ลือ��ส���า��ี��ะ�����"
 
-#: ../app/tools/gimppainttool.c:131
+#: ../app/tools/gimppainttool.c:143
 #, fuzzy
 msgid "Click to draw the line"
 msgstr "����ื�อสร�า��าร�ส���ัวอย�า�"
 
-#: ../app/tools/gimppainttool.c:132
+#: ../app/tools/gimppainttool.c:144
 #, fuzzy, c-format
 msgid "%s to pick a color"
 msgstr "�����สีห��า�า���ว�"
 
-#: ../app/tools/gimppainttool.c:494
-#, fuzzy
-msgid "Click in any image to pick the foreground color"
-msgstr "��ลี�ย�สี�ืิ��ห��า�ส���ิ�ั�"
-
-#: ../app/tools/gimppainttool.c:500
-#, fuzzy
-msgid "Click in any image to pick the background color"
-msgstr "��ลี�ย�สี�ื��หลั��ส���ิ�ั�"
-
-#: ../app/tools/gimppainttool.c:591
-#, fuzzy, c-format
-msgid "%s for constrained angles"
-msgstr "วั�ระยะ�ละมุม"
+#: ../app/tools/gimppainttool.c:279
+msgid "Cannot paint on layer groups."
+msgstr ""
 
-#: ../app/tools/gimppainttool.c:643
+#: ../app/tools/gimppainttool.c:689
 #, c-format
 msgid "%s for a straight line"
 msgstr ""
 
-#: ../app/tools/gimppenciltool.c:52
+#: ../app/tools/gimppenciltool.c:51
 msgid "Pencil Tool: Hard edge painting using a brush"
 msgstr ""
 
-#: ../app/tools/gimppenciltool.c:53
+#: ../app/tools/gimppenciltool.c:52
 msgid "Pe_ncil"
 msgstr "_�ิ�สอ"
 
-#: ../app/tools/gimpperspectivetool.c:69
-msgid "Perspective Tool: Change perspective of the layer or selection"
+#: ../app/tools/gimpperspectiveclonetool.c:128
+msgid ""
+"Perspective Clone Tool: Clone from an image source after applying a "
+"perspective transformation"
 msgstr ""
 
+#: ../app/tools/gimpperspectiveclonetool.c:130
+#, fuzzy
+msgid "_Perspective Clone"
+msgstr "�ั����าสี�หม�"
+
+#: ../app/tools/gimpperspectiveclonetool.c:703
+#, fuzzy
+msgid "Ctrl-Click to set a clone source"
+msgstr "����ื�อสร�า��ส���า��หม�"
+
 #: ../app/tools/gimpperspectivetool.c:70
-msgid "_Perspective"
+msgid "Perspective Tool: Change perspective of the layer, selection or path"
 msgstr ""
 
-#: ../app/tools/gimpperspectivetool.c:97
-msgid "command|Perspective"
+#: ../app/tools/gimpperspectivetool.c:72
+msgid "_Perspective"
 msgstr ""
 
-#: ../app/tools/gimpperspectivetool.c:98
-msgid "Perspective Transform Information"
-msgstr ""
+#: ../app/tools/gimpperspectivetool.c:99
+#, fuzzy
+#| msgid "_Properties"
+msgctxt "command"
+msgid "Perspective"
+msgstr "�ุ�_สม�ั�ิ"
 
-#: ../app/tools/gimpperspectivetool.c:114
+#: ../app/tools/gimpperspectivetool.c:100
+#, fuzzy
+#| msgid "Transformation"
+msgid "Perspective transformation"
+msgstr "�าร��ลี�ย�รู�ร�า�"
+
+#: ../app/tools/gimpperspectivetool.c:115
 #, fuzzy
 msgid "Transformation Matrix"
 msgstr "�าร��ลี�ย�รู�ร�า�"
 
-#: ../app/tools/gimpposterizetool.c:78
+#: ../app/tools/gimpposterizetool.c:85
 #, fuzzy
 msgid "Posterize Tool: Reduce to a limited set of colors"
 msgstr "ล�สีภา�����ำ�ว�สี�าย�ัว"
 
-#: ../app/tools/gimpposterizetool.c:79
+#: ../app/tools/gimpposterizetool.c:86
 msgid "_Posterize..."
 msgstr ""
 
-#: ../app/tools/gimpposterizetool.c:96
+#: ../app/tools/gimpposterizetool.c:103
 msgid "Posterize (Reduce Number of Colors)"
 msgstr ""
 
-#: ../app/tools/gimpposterizetool.c:140
+#: ../app/tools/gimpposterizetool.c:152
 msgid "Posterize does not operate on indexed layers."
 msgstr ""
 
-#: ../app/tools/gimpposterizetool.c:190
+#: ../app/tools/gimpposterizetool.c:230
 msgid "Posterize _levels:"
 msgstr ""
 
-#: ../app/tools/gimprectangleoptions.c:118
+#: ../app/tools/gimprectangleoptions.c:111
 msgid "Use all visible layers when shrinking the selection"
 msgstr "����ุ��ั���า��ี�มอ��ห���มื�อมี�ารห��ื���ี��ลือ�"
 
-#: ../app/tools/gimprectangleoptions.c:507
-msgid "Auto shrink selection"
-msgstr "ห��ื���ี��ลือ�อั���มั�ิ"
+#. Current, as in what is currently in use.
+#: ../app/tools/gimprectangleoptions.c:728
+#, fuzzy
+msgid "Current"
+msgstr "ส�า�ะ�ั��ุ�ั�"
 
-#: ../app/tools/gimprectangleoptions.c:526
+#: ../app/tools/gimprectangleoptions.c:806
 msgid "Expand from center"
 msgstr ""
 
-#: ../app/tools/gimprectangleoptions.c:531
+#: ../app/tools/gimprectangleoptions.c:829
 #, fuzzy
-msgid "Highlight"
-msgstr "สีสว�า�"
-
-#: ../app/tools/gimprectangleoptions.c:548 ../app/widgets/gimpcursorview.c:136
-#: ../app/widgets/gimpcursorview.c:158
-msgid "X"
-msgstr ""
+msgid "Fixed:"
+msgstr "���ม"
 
-#: ../app/tools/gimprectangleoptions.c:560 ../app/widgets/gimpcursorview.c:142
-#: ../app/widgets/gimpcursorview.c:164
-msgid "Y"
-msgstr ""
+#: ../app/tools/gimprectangleoptions.c:962
+#, fuzzy
+#| msgid "Positioned"
+msgid "Position:"
+msgstr "�ั��ำ�ห����ล�ว"
 
-#: ../app/tools/gimprectangleoptions.c:572 ../app/widgets/gimpgrideditor.c:257
-#: ../app/widgets/gimpgrideditor.c:289
-msgid "Width"
-msgstr "�ว�า�"
+#: ../app/tools/gimprectangleoptions.c:980
+#, fuzzy
+msgid "Highlight"
+msgstr "สีสว�า�"
 
-#: ../app/tools/gimprectangleoptions.c:580
-#: ../app/tools/gimprectangleoptions.c:597
-#: ../app/tools/gimprectangleoptions.c:618
-msgid "Fix"
-msgstr ""
+#. Auto Shrink
+#: ../app/tools/gimprectangleoptions.c:990
+#, fuzzy
+#| msgid "Auto shrink selection"
+msgid "Auto Shrink"
+msgstr "ห��ื���ี��ลือ�อั���มั�ิ"
 
-#: ../app/tools/gimprectangleoptions.c:587 ../app/widgets/gimpgrideditor.c:259
-#: ../app/widgets/gimpgrideditor.c:291
-msgid "Height"
-msgstr "สู�"
+#: ../app/tools/gimprectangleoptions.c:997
+#, fuzzy
+#| msgid "Shrink _Wrap"
+msgid "Shrink merged"
+msgstr "�รอ��_��าภา�"
 
-#: ../app/tools/gimprectangleoptions.c:604
+#: ../app/tools/gimprectangleselectoptions.c:163
 #, fuzzy
-msgid "Aspect"
-msgstr "อั�ราส�ว�:"
+#| msgid "Mouse Pointers"
+msgid "Rounded corners"
+msgstr "�ัว�ี��มาส�"
 
-#: ../app/tools/gimprectangleselecttool.c:133
+#: ../app/tools/gimprectangleselecttool.c:168
 #, fuzzy
 msgid "Rectangle Select"
 msgstr "สี��หลี�ยมมุม�า�"
 
-#: ../app/tools/gimprectangleselecttool.c:134
+#: ../app/tools/gimprectangleselecttool.c:169
 msgid "Rectangle Select Tool: Select a rectangular region"
 msgstr ""
 
-#: ../app/tools/gimprectangleselecttool.c:135
+#: ../app/tools/gimprectangleselecttool.c:170
 #, fuzzy
 msgid "_Rectangle Select"
 msgstr "สี��หลี�ยมมุ_ม�า�"
 
-#: ../app/tools/gimprectangletool.c:1163 ../app/tools/gimprectangletool.c:1973
+#: ../app/tools/gimprectangletool.c:1156 ../app/tools/gimprectangletool.c:2103
 msgid "Rectangle: "
 msgstr ""
 
+#: ../app/tools/gimpregionselectoptions.c:82
+msgid "Allow completely transparent regions to be selected"
+msgstr "อ�ุ�า��ห��ลือ��ื���ี���ร���ส���"
+
+#: ../app/tools/gimpregionselectoptions.c:89
+#, fuzzy
+#| msgid "Base selection on all visible layers"
+msgid "Base region_select on all visible layers"
+msgstr "�ลือ��า��ุ��ั���า��ี�มอ��ห���"
+
+#: ../app/tools/gimpregionselectoptions.c:201
+msgid "Select transparent areas"
+msgstr "�ลือ��ื���ี���ร���ส"
+
+#: ../app/tools/gimpregionselectoptions.c:226
+#, fuzzy
+msgid "Select by:"
+msgstr "�ลือ�"
+
 #: ../app/tools/gimpregionselecttool.c:164
 msgid "Move the mouse to change threshold"
 msgstr ""
 
-#: ../app/tools/gimprotatetool.c:86
+#: ../app/tools/gimprotatetool.c:90
 msgid "Rotate"
 msgstr "หมุ�"
 
-#: ../app/tools/gimprotatetool.c:87
+#: ../app/tools/gimprotatetool.c:91
 #, fuzzy
-msgid "Rotate Tool: Rotate the layer or selection"
+msgid "Rotate Tool: Rotate the layer, selection or path"
 msgstr "หมุ��ั���า�หรือ�ื���ี��ลือ�"
 
-#: ../app/tools/gimprotatetool.c:88
+#: ../app/tools/gimprotatetool.c:92
 msgid "_Rotate"
 msgstr "_หมุ�"
 
-#: ../app/tools/gimprotatetool.c:115
-msgid "Rotation Information"
-msgstr "�ารหมุ���อมูล"
+#: ../app/tools/gimprotatetool.c:188
+#, fuzzy
+#| msgid "Angle:"
+msgid "_Angle:"
+msgstr "มุม:"
 
-#: ../app/tools/gimprotatetool.c:159
-msgid "Center X:"
+#: ../app/tools/gimprotatetool.c:204
+#, fuzzy
+#| msgid "Center X:"
+msgid "Center _X:"
 msgstr "ศู�ย��ลา� X:"
 
-#: ../app/tools/gimprotatetool.c:167
-msgid "Center Y:"
+#: ../app/tools/gimprotatetool.c:213
+#, fuzzy
+#| msgid "Center Y:"
+msgid "Center _Y:"
 msgstr "ศู�ย��ลา� Y:"
 
-#: ../app/tools/gimpscaletool.c:79
+#: ../app/tools/gimpscaletool.c:77
 msgid "Scale"
 msgstr "�รั�สั�ส�ว�"
 
-#: ../app/tools/gimpscaletool.c:80
+#: ../app/tools/gimpscaletool.c:78
 #, fuzzy
-msgid "Scale Tool: Scale the layer or selection"
+msgid "Scale Tool: Scale the layer, selection or path"
 msgstr "�รั���า��ั���า�หรือ�ื���ี��ลือ�"
 
-#: ../app/tools/gimpscaletool.c:81
+#: ../app/tools/gimpscaletool.c:79
 msgid "_Scale"
 msgstr "�รั_�สั�ส�ว�"
 
-#: ../app/tools/gimpscaletool.c:107
-msgid "command|Scale"
-msgstr ""
-
-#: ../app/tools/gimpscaletool.c:108
+#: ../app/tools/gimpscaletool.c:105
 #, fuzzy
-msgid "Scaling Information"
-msgstr "�าร�รั���า���อมูล"
-
-#: ../app/tools/gimpselectionoptions.c:97
-msgid "Smooth edges"
-msgstr "�อ��รีย�"
-
-#: ../app/tools/gimpselectionoptions.c:111
-msgid "Allow completely transparent regions to be selected"
-msgstr "อ�ุ�า��ห��ลือ��ื���ี���ร���ส���"
-
-#: ../app/tools/gimpselectionoptions.c:117
-msgid "Base selection on all visible layers"
-msgstr "�ลือ��า��ุ��ั���า��ี�มอ��ห���"
+#| msgid "Scale"
+msgctxt "command"
+msgid "Scale"
+msgstr "�รั�สั�ส�ว�"
 
-#: ../app/tools/gimpselectionoptions.c:343 ../app/tools/gimptextoptions.c:457
+#: ../app/tools/gimpselectionoptions.c:257 ../app/tools/gimptextoptions.c:484
 msgid "Antialiasing"
 msgstr "��อ��ั��อ�หยั�"
 
-#: ../app/tools/gimpselectionoptions.c:363
+#: ../app/tools/gimpselectionoptions.c:272
 msgid "Feather edges"
 msgstr "�อ��ุ��"
 
-#: ../app/tools/gimpselectionoptions.c:389
-msgid "Show interactive boundary"
-msgstr "�ส���อ�����ี��ำ�า�"
-
-#: ../app/tools/gimpselectionoptions.c:413
-msgid "Select transparent areas"
-msgstr "�ลือ��ื���ี���ร���ส"
-
-#: ../app/tools/gimpselectionoptions.c:438
-#, fuzzy
-msgid "Select by:"
-msgstr "�ลือ�"
-
-#: ../app/tools/gimpselectiontool.c:272
+#: ../app/tools/gimpselectiontool.c:253
 #, fuzzy
 msgid "Click-Drag to replace the current selection"
 msgstr "รวม�ั��ี���ี��ี��ลือ�อยู�"
 
-#: ../app/tools/gimpselectiontool.c:280
+#: ../app/tools/gimpselectiontool.c:261
 #, fuzzy
 msgid "Click-Drag to create a new selection"
 msgstr "����ื�อสร�า��ส���า��หม�"
 
-#: ../app/tools/gimpselectiontool.c:285
+#: ../app/tools/gimpselectiontool.c:266
 #, fuzzy
 msgid "Click-Drag to add to the current selection"
 msgstr "รวม�ั��ี���ี��ี��ลือ�อยู�"
 
-#: ../app/tools/gimpselectiontool.c:294
+#: ../app/tools/gimpselectiontool.c:275
 #, fuzzy
 msgid "Click-Drag to subtract from the current selection"
 msgstr "ล�ออ��า��ี���ี��ี��ลือ�อยู�"
 
-#: ../app/tools/gimpselectiontool.c:303
+#: ../app/tools/gimpselectiontool.c:284
 #, fuzzy
 msgid "Click-Drag to intersect with the current selection"
 msgstr "���าะ�ี���ำ�ั��ี���ี��ี��ลือ�อยู�"
 
-#: ../app/tools/gimpselectiontool.c:311
+#: ../app/tools/gimpselectiontool.c:294
 #, fuzzy
 msgid "Click-Drag to move the selection mask"
 msgstr "���ล�วลา���ื�อ�ลื�อ��ุ�สมอรอ��"
 
-#: ../app/tools/gimpselectiontool.c:319
+#: ../app/tools/gimpselectiontool.c:302
 #, fuzzy
 msgid "Click-Drag to move the selected pixels"
 msgstr "�ลื�อ��ิล��อร��ี��ลือ��ี��"
 
-#: ../app/tools/gimpselectiontool.c:323
+#: ../app/tools/gimpselectiontool.c:306
 #, fuzzy
 msgid "Click-Drag to move a copy of the selected pixels"
 msgstr "�ลื�อ��ิล��อร��ี��ลือ��ี��"
 
-#: ../app/tools/gimpselectiontool.c:327
+#: ../app/tools/gimpselectiontool.c:310
 #, fuzzy
 msgid "Click to anchor the floating selection"
 msgstr "�ั��ัว�ื���ี��ลือ�ลอย�ัว"
 
-#: ../app/tools/gimpsheartool.c:86
+#: ../app/tools/gimpsheartool.c:81
 msgid "Shear"
 msgstr "�ยื�อ�ภา�"
 
-#: ../app/tools/gimpsheartool.c:87
+#: ../app/tools/gimpsheartool.c:82
 #, fuzzy
-msgid "Shear Tool: Shear the layer or selection"
+msgid "Shear Tool: Shear the layer, selection or path"
 msgstr "�ยี�อ��ั���า�หรือ�ื���ี��ลือ�"
 
-#: ../app/tools/gimpsheartool.c:88
+#: ../app/tools/gimpsheartool.c:83
 msgid "S_hear"
 msgstr ""
 
-#: ../app/tools/gimpsheartool.c:114
-msgid "command|Shear"
-msgstr ""
-
-#: ../app/tools/gimpsheartool.c:115
-msgid "Shearing Information"
-msgstr "��อมูล�าร�ยื�อ�ภา�"
+#: ../app/tools/gimpsheartool.c:109
+#, fuzzy
+#| msgid "Shear"
+msgctxt "command"
+msgid "Shear"
+msgstr "�ยื�อ�ภา�"
 
-#: ../app/tools/gimpsheartool.c:139
-msgid "Shear magnitude X:"
+#: ../app/tools/gimpsheartool.c:133
+#, fuzzy
+#| msgid "Shear magnitude X:"
+msgid "Shear magnitude _X:"
 msgstr "��า�ยื�อ���ว�อ�:"
 
-#: ../app/tools/gimpsheartool.c:149
-msgid "Shear magnitude Y:"
+#: ../app/tools/gimpsheartool.c:143
+#, fuzzy
+#| msgid "Shear magnitude Y:"
+msgid "Shear magnitude _Y:"
 msgstr "��า�ยื�อ���ว�ั��:"
 
-#: ../app/tools/gimpsmudgetool.c:55
+#: ../app/tools/gimpsmudgetool.c:53
 msgid "Smudge Tool: Smudge selectively using a brush"
 msgstr ""
 
-#: ../app/tools/gimpsmudgetool.c:56
+#: ../app/tools/gimpsmudgetool.c:54
 msgid "_Smudge"
 msgstr "_�ู"
 
-#: ../app/tools/gimpsmudgetool.c:75
+#: ../app/tools/gimpsmudgetool.c:73
 #, fuzzy
 msgid "Click to smudge"
 msgstr "����ื�อล��ุ�สมอ�ี�"
 
-#: ../app/tools/gimpsmudgetool.c:76
+#: ../app/tools/gimpsmudgetool.c:74
 #, fuzzy
 msgid "Click to smudge the line"
 msgstr "����ื�อล��ุ�สมอ�ี�"
 
-#: ../app/tools/gimptextoptions.c:115
+#: ../app/tools/gimptextoptions.c:133
 msgid ""
 "Hinting alters the font outline to produce a crisp bitmap at small sizes"
 msgstr ""
 
-#: ../app/tools/gimptextoptions.c:122
-msgid ""
-"If available, hints from the font are used but you may prefer to always use "
-"the automatic hinter"
+#: ../app/tools/gimptextoptions.c:141
+msgid "The text language may have an effect on the way the text is rendered."
 msgstr ""
 
-#: ../app/tools/gimptextoptions.c:147
+#: ../app/tools/gimptextoptions.c:157
 msgid "Indentation of the first line"
 msgstr "�ารย�อห��า�ี��รร�ั��ร�"
 
-#: ../app/tools/gimptextoptions.c:153
+#: ../app/tools/gimptextoptions.c:163
 #, fuzzy
 msgid "Adjust line spacing"
 msgstr "ระยะห�า��ส���ิ�ั�"
 
-#: ../app/tools/gimptextoptions.c:159
+#: ../app/tools/gimptextoptions.c:169
 #, fuzzy
 msgid "Adjust letter spacing"
 msgstr "ระยะห�า��ส���ิ�ั�"
 
-#: ../app/tools/gimptextoptions.c:429
+#: ../app/tools/gimptextoptions.c:175
+msgid "Text box resize mode"
+msgstr ""
+
+#: ../app/tools/gimptextoptions.c:182
+msgid ""
+"Use an external editor window for text entry, instead of direct-on-canvas "
+"editing"
+msgstr ""
+
+#: ../app/tools/gimptextoptions.c:464
 msgid "Font:"
 msgstr "���อั�ษร:"
 
-#: ../app/tools/gimptextoptions.c:441
-msgid "Hinting"
-msgstr ""
+#: ../app/tools/gimptextoptions.c:480
+#, fuzzy
+#| msgid "Text Editor"
+msgid "Use editor"
+msgstr "��รื�อ�มือ�������อ�วาม"
 
-#: ../app/tools/gimptextoptions.c:448
-msgid "Force auto-hinter"
+#: ../app/tools/gimptextoptions.c:500
+msgid "Hinting:"
 msgstr ""
 
-#: ../app/tools/gimptextoptions.c:463
+#: ../app/tools/gimptextoptions.c:504
 msgid "Text Color"
 msgstr "สีอั�ษร"
 
-#: ../app/tools/gimptextoptions.c:468
+#: ../app/tools/gimptextoptions.c:509
 msgid "Color:"
 msgstr "สี:"
 
-#: ../app/tools/gimptextoptions.c:473
+#: ../app/tools/gimptextoptions.c:515
 msgid "Justify:"
 msgstr "�ิ��อ�:"
 
-#: ../app/tools/gimptextoptions.c:492
-#, fuzzy
-msgid "Create Path from Text"
-msgstr "สร�า��ส���า��า�อั�ษร"
+#: ../app/tools/gimptextoptions.c:538
+msgid "Box:"
+msgstr ""
 
-#: ../app/tools/gimptextoptions.c:499
-#, fuzzy
-msgid "Text along Path"
-msgstr "�����ส��_�า�"
+#: ../app/tools/gimptextoptions.c:552
+msgid "Language:"
+msgstr ""
 
-#: ../app/tools/gimptexttool.c:144
+#: ../app/tools/gimptexttool.c:193
+msgid "Text"
+msgstr "��อ�วาม"
+
+#: ../app/tools/gimptexttool.c:194
 msgid "Text Tool: Create or edit text layers"
 msgstr ""
 
-#: ../app/tools/gimptexttool.c:145
+#: ../app/tools/gimptexttool.c:195
 msgid "Te_xt"
 msgstr "��อ_�วาม"
 
-#: ../app/tools/gimptexttool.c:758
-msgid "GIMP Text Editor"
-msgstr "�ัว�������อ�วาม GIMP"
+#: ../app/tools/gimptexttool.c:941
+#, fuzzy
+#| msgid "Rename Text Layer"
+msgid "Reshape Text Layer"
+msgstr "��ลี�ย��ื�อ�ั���า���อ�วาม"
 
-#: ../app/tools/gimptexttool.c:869 ../app/tools/gimptexttool.c:872
+#: ../app/tools/gimptexttool.c:1479 ../app/tools/gimptexttool.c:1482
 msgid "Confirm Text Editing"
 msgstr "ยื�ยั��าร�������อ�วาม"
 
-#: ../app/tools/gimptexttool.c:901
+#: ../app/tools/gimptexttool.c:1486
+#, fuzzy
+#| msgid "Create a New Layer"
+msgid "Create _New Layer"
+msgstr "สร�า��ั���า��หม�"
+
+#: ../app/tools/gimptexttool.c:1510
 msgid ""
 "The layer you selected is a text layer but it has been modified using other "
 "tools. Editing the layer with the text tool will discard these "
@@ -10182,86 +14725,113 @@ msgstr ""
 "\n"
 "��า�สามาร�������ั���า�หรือสร�า��ั���า���อ�วาม�หม��า��ุ�สม�ั�ิ��อ�วาม"
 
-#: ../app/tools/gimpthresholdtool.c:83
+#: ../app/tools/gimptexttool-editor.c:1111
+msgid "GIMP Text Editor"
+msgstr "��รื�อ�มือ�������อ�วาม GIMP"
+
+#: ../app/tools/gimpthresholdtool.c:91
 #, fuzzy
 msgid "Threshold Tool: Reduce image to two colors using a threshold"
 msgstr "ล���อมูลสีภา�����สอ�สี��ย�����า threshold"
 
-#: ../app/tools/gimpthresholdtool.c:84
+#: ../app/tools/gimpthresholdtool.c:92
 msgid "_Threshold..."
 msgstr ""
 
-#: ../app/tools/gimpthresholdtool.c:101
+#: ../app/tools/gimpthresholdtool.c:109
 msgid "Apply Threshold"
 msgstr ""
 
-#: ../app/tools/gimpthresholdtool.c:154
+#: ../app/tools/gimpthresholdtool.c:111
+msgid "Import Threshold Settings"
+msgstr ""
+
+#: ../app/tools/gimpthresholdtool.c:112
+msgid "Export Threshold Settings"
+msgstr ""
+
+#: ../app/tools/gimpthresholdtool.c:162
 msgid "Threshold does not operate on indexed layers."
 msgstr ""
 
-#: ../app/tools/gimpthresholdtool.c:243
+#: ../app/tools/gimpthresholdtool.c:270
 msgid "Automatically adjust to optimal binarization threshold"
 msgstr ""
 
-#: ../app/tools/gimptransformoptions.c:287
-msgid "Transform Direction"
-msgstr "�ำ�ั��าร��ล�ลั�ษ�ะภา�"
+#: ../app/tools/gimptool.c:886
+msgid "Can't work on an empty image, add a layer first"
+msgstr ""
+
+#: ../app/tools/gimptransformoptions.c:272
+#, fuzzy
+#| msgid "Transform"
+msgid "Transform:"
+msgstr "��ลี�ย�รู�ร�า�"
+
+#: ../app/tools/gimptransformoptions.c:281
+#: ../app/widgets/gimpdynamicseditor.c:150
+#: ../app/widgets/gimpdynamicsoutputeditor.c:227
+#, fuzzy
+#| msgid "Description"
+msgid "Direction"
+msgstr "�ำอ�ิ�าย"
 
-#: ../app/tools/gimptransformoptions.c:296
+#. the interpolation menu
+#: ../app/tools/gimptransformoptions.c:286
 msgid "Interpolation:"
 msgstr "วิ�ี�าร�ระมา���า:"
 
-#: ../app/tools/gimptransformoptions.c:306
-msgid "Supersampling"
-msgstr ""
-
-#. the clip resulting image toggle button
-#: ../app/tools/gimptransformoptions.c:311
-msgid "Clip result"
-msgstr ""
+#: ../app/tools/gimptransformoptions.c:299
+#, fuzzy
+msgid "Clipping:"
+msgstr "�ำลั��ลิ�..."
 
-#: ../app/tools/gimptransformoptions.c:325
+#: ../app/tools/gimptransformoptions.c:317
 msgid "Preview:"
 msgstr "�ู�ัวอย�า�:"
 
-#: ../app/tools/gimptransformoptions.c:366
+#: ../app/tools/gimptransformoptions.c:388
 #, fuzzy, c-format
 msgid "15 degrees  (%s)"
 msgstr "15 อ�ศา  %s"
 
-#: ../app/tools/gimptransformoptions.c:370
+#: ../app/tools/gimptransformoptions.c:392
 #, fuzzy, c-format
 msgid "Keep aspect  (%s)"
-msgstr "��อั�ราส�ว�  %s"
+msgstr "��สั�ส�ว�  %s"
 
-#: ../app/tools/gimptransformtool.c:228
+#: ../app/tools/gimptransformtool.c:239
 #, fuzzy
 msgid "Transforming"
 msgstr "�ำลั���ล�ลั�ษ�ะภา�..."
 
-#: ../app/tools/gimptransformtool.c:1047
+#: ../app/tools/gimptransformtool.c:1192
 #, fuzzy
 msgid "There is no layer to transform."
 msgstr "�ม�มี�ั���า�หรือ�����ล�ี��ำลั��ำ�า�อยู��ห��ั�ออ�มา"
 
-#: ../app/tools/gimptransformtool.c:1058
+#: ../app/tools/gimptransformtool.c:1205
 #, fuzzy
 msgid "There is no path to transform."
 msgstr "�ม�มี�ั���า�หรือ�����ล�ี��ำลั��ำ�า�อยู��ห��ั�ออ�มา"
 
-#: ../app/tools/gimpvectoroptions.c:77
+#: ../app/tools/gimptransformtool.c:1206
+msgid "The active path's strokes are locked."
+msgstr ""
+
+#: ../app/tools/gimpvectoroptions.c:76
 msgid "Restrict editing to polygons"
 msgstr "�ำ�ั��าร���������รู�หลาย�หลี�ยม"
 
-#: ../app/tools/gimpvectoroptions.c:145
+#: ../app/tools/gimpvectoroptions.c:155
 msgid "Edit Mode"
 msgstr "ส�า�ะ �าร�����"
 
-#: ../app/tools/gimpvectoroptions.c:150
+#: ../app/tools/gimpvectoroptions.c:173
 msgid "Polygonal"
 msgstr "รู�หลาย�หลี�ยม"
 
-#: ../app/tools/gimpvectoroptions.c:154
+#: ../app/tools/gimpvectoroptions.c:177
 #, c-format
 msgid ""
 "Path to Selection\n"
@@ -10274,659 +14844,733 @@ msgstr ""
 "%s  ���ล�\n"
 "%s  �����ำ"
 
-#: ../app/tools/gimpvectoroptions.c:164
+#. Create a selection from the current path
+#: ../app/tools/gimpvectoroptions.c:188
 #, fuzzy
-msgid "Create Selection from Path"
-msgstr "สร�า��ื���ี��ลือ��า��ส���า�"
+#| msgid "Selecti_on to Path"
+msgid "Selection from Path"
+msgstr "��ล��ื���ี��ลือ������ส��_�า�"
 
-#: ../app/tools/gimpvectortool.c:159
+#: ../app/tools/gimpvectortool.c:163
 #, fuzzy
 msgid "Paths Tool: Create and edit paths"
 msgstr "สร�า��ละ������ส���า�"
 
-#: ../app/tools/gimpvectortool.c:160
+#: ../app/tools/gimpvectortool.c:164
 #, fuzzy
 msgid "Pat_hs"
 msgstr "�ส���า�"
 
-#: ../app/tools/gimpvectortool.c:319
+#: ../app/tools/gimpvectortool.c:254
+#, fuzzy
+msgid "The active path is locked."
+msgstr "ส��ออ���อมูล�ส���า��ี��ลือ�อยู�"
+
+#: ../app/tools/gimpvectortool.c:342
 msgid "Add Stroke"
 msgstr "��ิ�ม�ส��"
 
-#: ../app/tools/gimpvectortool.c:337
+#: ../app/tools/gimpvectortool.c:366
 msgid "Add Anchor"
 msgstr "��ิ�ม�ุ�สมอ"
 
-#: ../app/tools/gimpvectortool.c:360
+#: ../app/tools/gimpvectortool.c:392
 msgid "Insert Anchor"
 msgstr "��ร��ุ�สมอ"
 
-#: ../app/tools/gimpvectortool.c:389
+#: ../app/tools/gimpvectortool.c:423
 msgid "Drag Handle"
 msgstr "ลา�"
 
-#: ../app/tools/gimpvectortool.c:418
+#: ../app/tools/gimpvectortool.c:453
 msgid "Drag Anchor"
 msgstr "ลา��ุ�สมอ"
 
-#: ../app/tools/gimpvectortool.c:435
+#: ../app/tools/gimpvectortool.c:471
 msgid "Drag Anchors"
 msgstr "ลา��ุ�สมอ"
 
-#: ../app/tools/gimpvectortool.c:455
+#: ../app/tools/gimpvectortool.c:494
 msgid "Drag Curve"
 msgstr "ลา�ส�ว�����"
 
-#: ../app/tools/gimpvectortool.c:483
+#: ../app/tools/gimpvectortool.c:523
 msgid "Connect Strokes"
 msgstr "��อ�ส��"
 
-#: ../app/tools/gimpvectortool.c:513
+#: ../app/tools/gimpvectortool.c:555
 msgid "Drag Path"
 msgstr "ลา��ส���า�"
 
-#: ../app/tools/gimpvectortool.c:523
+#: ../app/tools/gimpvectortool.c:566
 msgid "Convert Edge"
 msgstr "��รสภา��อ�"
 
-#: ../app/tools/gimpvectortool.c:553
+#: ../app/tools/gimpvectortool.c:597
 msgid "Delete Anchor"
 msgstr "ล��ุ�สมอ"
 
-#: ../app/tools/gimpvectortool.c:575
+#: ../app/tools/gimpvectortool.c:620
 msgid "Delete Segment"
 msgstr ""
 
-#: ../app/tools/gimpvectortool.c:784
+#: ../app/tools/gimpvectortool.c:839
 msgid "Move Anchors"
 msgstr "�ลื�อ��ุ�สมอ"
 
-#: ../app/tools/gimpvectortool.c:1141
+#: ../app/tools/gimpvectortool.c:1199
 #, fuzzy
 msgid "Click to pick path to edit"
 msgstr "����ื�อ�ลือ��ส���า��ี��ะ�����"
 
-#: ../app/tools/gimpvectortool.c:1144
+#: ../app/tools/gimpvectortool.c:1203
 #, fuzzy
 msgid "Click to create a new path"
 msgstr "����ื�อสร�า��ส���า��หม�"
 
-#: ../app/tools/gimpvectortool.c:1147
+#: ../app/tools/gimpvectortool.c:1207
 #, fuzzy
 msgid "Click to create a new component of the path"
 msgstr "����ื�อสร�า�ส�ว���ระ�อ��หม��อ��ส���า�"
 
-#: ../app/tools/gimpvectortool.c:1150
+#: ../app/tools/gimpvectortool.c:1211
 #, fuzzy
-msgid "Click to create a new anchor"
+msgid "Click or Click-Drag to create a new anchor"
 msgstr "����ื�อสร�า��ส���า��หม�"
 
-#: ../app/tools/gimpvectortool.c:1156
+#: ../app/tools/gimpvectortool.c:1221 ../app/tools/gimpvectortool.c:1228
 #, fuzzy
 msgid "Click-Drag to move the anchor around"
 msgstr "���ล�วลา���ื�อ�ลื�อ��ุ�สมอรอ��"
 
-#: ../app/tools/gimpvectortool.c:1159 ../app/tools/gimpvectortool.c:1170
+#: ../app/tools/gimpvectortool.c:1232 ../app/tools/gimpvectortool.c:1255
 #, fuzzy
 msgid "Click-Drag to move the anchors around"
 msgstr "���ล�วลา���ื�อ�ลื�อ��ุ�สมอรอ��"
 
-#: ../app/tools/gimpvectortool.c:1162
+#: ../app/tools/gimpvectortool.c:1238
 #, fuzzy
 msgid "Click-Drag to move the handle around"
 msgstr "���ล�วลา���ื�อ�ลื�อ��ุ�สมอรอ��"
 
-#: ../app/tools/gimpvectortool.c:1175
+#: ../app/tools/gimpvectortool.c:1245
+#, fuzzy
+msgid "Click-Drag to move the handles around symmetrically"
+msgstr "���ล�วลา���ื�อ�ลื�อ��ุ�สมอรอ��"
+
+#: ../app/tools/gimpvectortool.c:1260
 #, fuzzy
 msgid "Click-Drag to change the shape of the curve"
 msgstr "��-ลา���ื�อ��ลี�ย�รู�ร�า��อ�ส�ว����� (SHIFT: สมมา�ร)"
 
-#: ../app/tools/gimpvectortool.c:1178
+#: ../app/tools/gimpvectortool.c:1263
 #, c-format
 msgid "%s: symmetrical"
 msgstr ""
 
-#: ../app/tools/gimpvectortool.c:1182
+#: ../app/tools/gimpvectortool.c:1268
 #, fuzzy
 msgid "Click-Drag to move the component around"
 msgstr "���ล�วลา���ื�อ�ลื�อ��ส���า�รอ��"
 
-#: ../app/tools/gimpvectortool.c:1189
+#: ../app/tools/gimpvectortool.c:1276
 #, fuzzy
 msgid "Click-Drag to move the path around"
 msgstr "���ล�วลา���ื�อ�ลื�อ��ส���า�รอ��"
 
-#: ../app/tools/gimpvectortool.c:1192
+#: ../app/tools/gimpvectortool.c:1280
 #, fuzzy
 msgid "Click-Drag to insert an anchor on the path"
 msgstr "����ื�อ��ร��ุ�สมอ���ส���า� (�� SHIFT)"
 
-#: ../app/tools/gimpvectortool.c:1199
+#: ../app/tools/gimpvectortool.c:1288
 #, fuzzy
 msgid "Click to delete this anchor"
 msgstr "����ื�อล��ุ�สมอ�ี�"
 
-#: ../app/tools/gimpvectortool.c:1202
+#: ../app/tools/gimpvectortool.c:1292
 #, fuzzy
 msgid "Click to connect this anchor with the selected endpoint"
 msgstr "����ื�อ��อ�ุ�สมอ�ี��ั��ุ�อื���ี��ลือ��ว�"
 
-#: ../app/tools/gimpvectortool.c:1206
+#: ../app/tools/gimpvectortool.c:1297
 #, fuzzy
 msgid "Click to open up the path"
 msgstr "����ื�อ��ิ��ส���า�"
 
-#: ../app/tools/gimpvectortool.c:1209
+#: ../app/tools/gimpvectortool.c:1301
 #, fuzzy
 msgid "Click to make this node angular"
 msgstr "����ื�อ�ำ�ห��ุ��ี�����มุม"
 
-#: ../app/tools/gimpvectortool.c:1715
+#: ../app/tools/gimpvectortool.c:1811
 msgid "Delete Anchors"
 msgstr "ล��ุ�สมอ"
 
-#: ../app/tools/gimpvectortool.c:1885
+#: ../app/tools/gimpvectortool.c:1957
+msgid "Path to selection"
+msgstr "��ล��ส���า������ี���ี��ลือ�"
+
+#: ../app/tools/gimpvectortool.c:1984
 msgid "There is no active layer or channel to stroke to"
 msgstr "�ม����าร�ลือ��ั���า�หรือ�����ล�ี��ะ�ำ�าร�ี�ส�����"
 
-#: ../app/tools/tools-enums.c:26
-msgid "Pick only"
-msgstr "�������า�ั��"
-
-#: ../app/tools/tools-enums.c:27
-msgid "Set foreground color"
-msgstr "��ลี�ย��ี�สี�ื��ห��า"
-
-#: ../app/tools/tools-enums.c:28
-msgid "Set background color"
-msgstr "��ลี�ย��ี�สี�ื��หลั�"
-
-#: ../app/tools/tools-enums.c:29
-#, fuzzy
-msgid "Add to palette"
-msgstr "��ิ�ม���า���า�สี  %s"
-
-#: ../app/tools/tools-enums.c:58
+#: ../app/tools/tools-enums.c:91
 #, fuzzy
+msgctxt "rectangle-guide"
 msgid "No guides"
 msgstr "�ส���ส��_�ำ��ว"
 
-#: ../app/tools/tools-enums.c:59
+#: ../app/tools/tools-enums.c:92
 #, fuzzy
+msgctxt "rectangle-guide"
 msgid "Center lines"
 msgstr "�ร��ลา�"
 
-#: ../app/tools/tools-enums.c:60
+#: ../app/tools/tools-enums.c:93
 #, fuzzy
+msgctxt "rectangle-guide"
 msgid "Rule of thirds"
 msgstr "�ำ�ว��ั���า�: "
 
-#: ../app/tools/tools-enums.c:61
+#: ../app/tools/tools-enums.c:94
 #, fuzzy
+msgctxt "rectangle-guide"
 msgid "Golden sections"
 msgstr "�ลื�อ��ื���ี��ลือ�"
 
-#: ../app/tools/tools-enums.c:89
-msgid "No constraint"
+#: ../app/tools/tools-enums.c:95
+msgctxt "rectangle-guide"
+msgid "Diagonal lines"
 msgstr ""
 
-#: ../app/tools/tools-enums.c:90
+#: ../app/tools/tools-enums.c:185
 #, fuzzy
-msgid "Image bounds"
-msgstr "ห��า��า�ภา�"
+#| msgid "Aspect ratio:"
+msgctxt "rectangle-tool-fixed-rule"
+msgid "Aspect ratio"
+msgstr "สั�ส�ว�:"
 
-#: ../app/tools/tools-enums.c:91
+#: ../app/tools/tools-enums.c:186
 #, fuzzy
-msgid "Drawable bounds"
-msgstr "สามาร�วา����"
+#| msgid "Width"
+msgctxt "rectangle-tool-fixed-rule"
+msgid "Width"
+msgstr "�ว�า�"
+
+#: ../app/tools/tools-enums.c:187
+#, fuzzy
+#| msgid "Height"
+msgctxt "rectangle-tool-fixed-rule"
+msgid "Height"
+msgstr "สู�"
 
-#: ../app/tools/tools-enums.c:119
+#: ../app/tools/tools-enums.c:188
+#, fuzzy
+#| msgid "Size"
+msgctxt "rectangle-tool-fixed-rule"
+msgid "Size"
+msgstr "��า�"
+
+#: ../app/tools/tools-enums.c:217
+#, fuzzy
+#| msgid "Free select"
+msgctxt "rect-select-mode"
 msgid "Free select"
 msgstr "�ลือ�อิสระ"
 
-#: ../app/tools/tools-enums.c:120
+#: ../app/tools/tools-enums.c:218
+#, fuzzy
+#| msgid "Fixed size"
+msgctxt "rect-select-mode"
 msgid "Fixed size"
 msgstr "��า��าย�ัว"
 
-#: ../app/tools/tools-enums.c:121
+#: ../app/tools/tools-enums.c:219
+#, fuzzy
+#| msgid "Fixed aspect ratio"
+msgctxt "rect-select-mode"
 msgid "Fixed aspect ratio"
-msgstr "อั�ราส�ว��าย�ัว"
-
-#: ../app/tools/tools-enums.c:149
-msgid "Transform layer"
-msgstr "��ล�ลั�ษ�ะ�อ��ั���า�"
+msgstr "สั�ส�ว��าย�ัว"
 
-#: ../app/tools/tools-enums.c:150
-msgid "Transform selection"
-msgstr "��ล�ลั�ษ�ะ�ื���ี��ลือ�"
-
-#: ../app/tools/tools-enums.c:151
-msgid "Transform path"
-msgstr "��ล�ลั�ษ�ะ�ส���า�"
+#: ../app/tools/tools-enums.c:248
+#, fuzzy
+#| msgid "Layer"
+msgctxt "transform-type"
+msgid "Layer"
+msgstr "�ั���า�"
 
-#: ../app/tools/tools-enums.c:179
-msgid "Design"
-msgstr "ออ����"
+#: ../app/tools/tools-enums.c:249
+#, fuzzy
+#| msgid "Selection"
+msgctxt "transform-type"
+msgid "Selection"
+msgstr "�ื���ี��าร�ลือ�"
 
-#: ../app/tools/tools-enums.c:181
-msgid "Move"
-msgstr "�ลื�อ�"
+#: ../app/tools/tools-enums.c:250
+#, fuzzy
+#| msgid "Path"
+msgctxt "transform-type"
+msgid "Path"
+msgstr "�ส���า�"
 
-#: ../app/tools/tools-enums.c:210
+#: ../app/tools/tools-enums.c:280
+#, fuzzy
+#| msgid "Outline"
+msgctxt "transform-preview-type"
 msgid "Outline"
 msgstr "�ส����ร��า�"
 
-#: ../app/tools/tools-enums.c:213
+#: ../app/tools/tools-enums.c:281
+#, fuzzy
+#| msgid "Grid"
+msgctxt "transform-preview-type"
+msgid "Grid"
+msgstr "�ะ��ร�"
+
+#: ../app/tools/tools-enums.c:282
+#, fuzzy
+#| msgid "Image"
+msgctxt "transform-preview-type"
+msgid "Image"
+msgstr "ภา�"
+
+#: ../app/tools/tools-enums.c:283
+#, fuzzy
+#| msgid "Image + Grid"
+msgctxt "transform-preview-type"
 msgid "Image + Grid"
 msgstr "ภา� + �ส���ิ�ั�"
 
-#: ../app/tools/tools-enums.c:240
+#: ../app/tools/tools-enums.c:311
+#, fuzzy
+#| msgid "Number of grid lines"
+msgctxt "transform-grid-type"
 msgid "Number of grid lines"
 msgstr "�ำ�ว��อ��ส���ิ�ั�"
 
-#: ../app/tools/tools-enums.c:241
+#: ../app/tools/tools-enums.c:312
+#, fuzzy
+#| msgid "Grid line spacing"
+msgctxt "transform-grid-type"
 msgid "Grid line spacing"
 msgstr "ระยะห�า��ส���ิ�ั�"
 
-#: ../app/vectors/gimpvectors.c:191
-msgid "Path"
-msgstr "�ส���า�"
+#: ../app/tools/tools-enums.c:341
+#, fuzzy
+#| msgid "Design"
+msgctxt "vector-mode"
+msgid "Design"
+msgstr "ออ����"
+
+#: ../app/tools/tools-enums.c:342
+#, fuzzy
+#| msgid "Edit"
+msgctxt "vector-mode"
+msgid "Edit"
+msgstr "�����"
+
+#: ../app/tools/tools-enums.c:343
+#, fuzzy
+#| msgid "Move"
+msgctxt "vector-mode"
+msgid "Move"
+msgstr "�ลื�อ�"
 
-#: ../app/vectors/gimpvectors.c:192
+#: ../app/vectors/gimpvectors.c:195
 msgid "Rename Path"
 msgstr "��ลี�ย��ื�อ�ส���า�"
 
-#: ../app/vectors/gimpvectors.c:193 ../app/vectors/gimpvectors.c:318
+#: ../app/vectors/gimpvectors.c:196 ../app/vectors/gimpvectors.c:335
 msgid "Move Path"
 msgstr "�ลื�อ��ส���า�"
 
-#: ../app/vectors/gimpvectors.c:194
+#: ../app/vectors/gimpvectors.c:197
 msgid "Scale Path"
 msgstr "�รั�สั�ส�ว��ส���า�"
 
-#: ../app/vectors/gimpvectors.c:195
+#: ../app/vectors/gimpvectors.c:198
 msgid "Resize Path"
 msgstr "�รั���า��ส���า�"
 
-#: ../app/vectors/gimpvectors.c:196 ../app/vectors/gimpvectors.c:412
+#: ../app/vectors/gimpvectors.c:199 ../app/vectors/gimpvectors.c:434
 msgid "Flip Path"
 msgstr "�ลั���า��ส���า�"
 
-#: ../app/vectors/gimpvectors.c:197 ../app/vectors/gimpvectors.c:443
+#: ../app/vectors/gimpvectors.c:200 ../app/vectors/gimpvectors.c:465
 msgid "Rotate Path"
 msgstr "หมุ��ส���า�"
 
-#: ../app/vectors/gimpvectors.c:198 ../app/vectors/gimpvectors.c:474
+#: ../app/vectors/gimpvectors.c:201 ../app/vectors/gimpvectors.c:495
 msgid "Transform Path"
 msgstr "��ล�ลั�ษ�ะ�ส���า�"
 
-#: ../app/vectors/gimpvectors-export.c:96
+#: ../app/vectors/gimpvectors-export.c:95
 #, c-format
 msgid "Error while writing '%s': %s"
 msgstr "��ิ���อ�ิ��ลา���ะ��ีย� '%s': %s"
 
-#: ../app/vectors/gimpvectors-import.c:287
+#: ../app/vectors/gimpvectors-import.c:330
 msgid "Import Paths"
 msgstr "�ำ���า�ส���า�"
 
-#: ../app/vectors/gimpvectors-import.c:298
+#: ../app/vectors/gimpvectors-import.c:341
 msgid "Imported Path"
 msgstr "�ส���า��ำ���า"
 
-#: ../app/vectors/gimpvectors-import.c:324
+#: ../app/vectors/gimpvectors-import.c:372
 #, c-format
 msgid "No paths found in '%s'"
 msgstr "�ม����ส���า��� '%s'"
 
-#: ../app/vectors/gimpvectors-import.c:327
+#: ../app/vectors/gimpvectors-import.c:376
 msgid "No paths found in the buffer"
 msgstr "�ม����ส���า����ี��ั���อมูล�ั�ว�ราว"
 
-#: ../app/vectors/gimpvectors-import.c:337
+#: ../app/vectors/gimpvectors-import.c:386
 #, c-format
 msgid "Failed to import paths from '%s': %s"
 msgstr "�าร�ำ���า�ส���า��า� '%s': %s ล�ม�หลว"
 
-#: ../app/widgets/gimpactiongroup.c:779
+#: ../app/widgets/gimpactioneditor.c:66
+#, fuzzy
+#| msgid "Shear"
+msgid "_Search:"
+msgstr "�ยื�อ�ภา�"
+
+#: ../app/widgets/gimpactiongroup.c:845
 #, c-format
 msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
 msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
 
-#: ../app/widgets/gimpactionview.c:303
-#: ../app/widgets/gimpcontrollereditor.c:379
+#: ../app/widgets/gimpactionview.c:337
+#: ../app/widgets/gimpcontrollereditor.c:344
 msgid "Action"
 msgstr ""
 
-#: ../app/widgets/gimpactionview.c:332
+#: ../app/widgets/gimpactionview.c:366
 msgid "Shortcut"
 msgstr "�ีย�ลั�"
 
-#: ../app/widgets/gimpactionview.c:354
+#: ../app/widgets/gimpactionview.c:392
 msgid "Name"
 msgstr "�ื�อ"
 
-#: ../app/widgets/gimpactionview.c:485 ../app/widgets/gimpactionview.c:671
+#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:832
 msgid "Changing shortcut failed."
 msgstr "�าร��ลี�ย��ีย�ลั�ล�ม�หลว"
 
-#: ../app/widgets/gimpactionview.c:525
+#: ../app/widgets/gimpactionview.c:669
 msgid "Conflicting Shortcuts"
 msgstr ""
 
-#: ../app/widgets/gimpactionview.c:531
+#: ../app/widgets/gimpactionview.c:675
 msgid "_Reassign shortcut"
 msgstr "�ำ_ห���ีย�ลั�"
 
-#: ../app/widgets/gimpactionview.c:542
+#: ../app/widgets/gimpactionview.c:690
 #, c-format
 msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group."
 msgstr ""
 
-#: ../app/widgets/gimpactionview.c:546
+#: ../app/widgets/gimpactionview.c:694
 #, c-format
 msgid "Reassigning the shortcut will cause it to be removed from \"%s\"."
 msgstr "�าร�ำห���ีย�ลั��ะ�ำ�ห�มั��ุ�ย�ายออ��า� \"%s\""
 
-#: ../app/widgets/gimpactionview.c:604
-msgid "Removing shortcut failed."
-msgstr "�ารย�าย�ีย�ลั�ล�ม�หลว"
-
-#: ../app/widgets/gimpactionview.c:610
+#: ../app/widgets/gimpactionview.c:767
 msgid "Invalid shortcut."
 msgstr "�ีย�ลั��ม�มี�ล"
 
-#: ../app/widgets/gimpbrusheditor.c:169
+#: ../app/widgets/gimpactionview.c:856
+msgid "Removing shortcut failed."
+msgstr "�ารย�าย�ีย�ลั�ล�ม�หลว"
+
+#: ../app/widgets/gimpbrusheditor.c:168
 msgid "Spikes:"
 msgstr ""
 
-#: ../app/widgets/gimpbrusheditor.c:182
+#: ../app/widgets/gimpbrusheditor.c:181
 msgid "Hardness:"
 msgstr "��ำห�ั�:"
 
-#: ../app/widgets/gimpbrusheditor.c:195
+#: ../app/widgets/gimpbrusheditor.c:194
 msgid "Aspect ratio:"
-msgstr "อั�ราส�ว�:"
+msgstr "สั�ส�ว�:"
 
-#: ../app/widgets/gimpbrusheditor.c:221
-#: ../app/widgets/gimpbrushfactoryview.c:82
+#: ../app/widgets/gimpbrusheditor.c:220
+#: ../app/widgets/gimpbrushfactoryview.c:81
 msgid "Spacing:"
 msgstr "ระยะ�ี��ร�:"
 
-#: ../app/widgets/gimpbrusheditor.c:224
-#: ../app/widgets/gimpbrushfactoryview.c:85
+#: ../app/widgets/gimpbrusheditor.c:223
+#: ../app/widgets/gimpbrushfactoryview.c:84
 msgid "Percentage of width of brush"
 msgstr "สั�ส�ว��วาม�ว�า��อ�หัว��ร�"
 
 #: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:257
-#: ../app/widgets/gimpeditor.c:724
+#: ../app/widgets/gimpeditor.c:735
 msgid "(None)"
 msgstr "(�ม�มี)"
 
-#: ../app/widgets/gimpcellrendereraccel.c:196
-#: ../app/widgets/gimpcellrendereraccel.c:421
-msgid "Type a new accelerator, or press Backspace to clear"
-msgstr "���ีย���ว��หม� หรือ�� Backspace ��ื�อล�ออ�"
-
-#: ../app/widgets/gimpcellrendereraccel.c:424
-msgid "Type a new accelerator"
-msgstr "�ิม���ีย���ว�อั��หม�"
-
-#: ../app/widgets/gimpchanneltreeview.c:119
+#: ../app/widgets/gimpchanneltreeview.c:134
 msgid "Reorder Channel"
 msgstr "�ั�ลำ�ั������ล�หม�"
 
-#: ../app/widgets/gimpchanneltreeview.c:319
-msgid "Empty Channel"
-msgstr "�����ล��ล�า"
-
-#: ../app/widgets/gimpcolordialog.c:150
+#: ../app/widgets/gimpcolordialog.c:149
 msgid "Add the current color to the color history"
 msgstr "��ิ�มสี�ั��ุ�ั����าสู��ระวั�ิสี"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:149
+#: ../app/widgets/gimpcolordisplayeditor.c:151
 msgid "Available Filters"
 msgstr "�ิล��อร��ี�������"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:199
+#: ../app/widgets/gimpcolordisplayeditor.c:212
 msgid "Move the selected filter up"
 msgstr "�ลื�อ��ิล��อร��ี��ลือ��ี��"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:208
+#: ../app/widgets/gimpcolordisplayeditor.c:221
 msgid "Move the selected filter down"
 msgstr "�ลื�อ��ิล��อร��ี��ลือ�ล�"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:253
+#: ../app/widgets/gimpcolordisplayeditor.c:267
 msgid "Active Filters"
 msgstr "�ิล��อร��ี��ำลั��ำ�า�"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:294
+#: ../app/widgets/gimpcolordisplayeditor.c:318
 msgid "Reset the selected filter to default values"
 msgstr "��ลี�ย���า�ิล��อร��ี��ลือ�������า�ริยาย"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:464
+#: ../app/widgets/gimpcolordisplayeditor.c:492
 #, fuzzy, c-format
 msgid "Add '%s' to the list of active filters"
 msgstr "��ิ�ม�ิล��อร��ี��ลือ����า����ราย�าร�อ��ิล��อร��ี��ำลั�����า�"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:501
+#: ../app/widgets/gimpcolordisplayeditor.c:529
 #, fuzzy, c-format
 msgid "Remove '%s' from the list of active filters"
 msgstr "ล��ิล��อร��ี��ลือ�ออ��า���ราย�าร�อ��ิล��อร��ี��ำลั�����า�"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:532
+#: ../app/widgets/gimpcolordisplayeditor.c:560
 msgid "No filter selected"
 msgstr "�ม�มี�าร�ลือ��ิล��อร�"
 
-#: ../app/widgets/gimpcoloreditor.c:263
+#: ../app/widgets/gimpcoloreditor.c:262
 msgid ""
 "Hexadecimal color notation as used in HTML and CSS.  This entry also accepts "
 "CSS color names."
 msgstr ""
 
-#: ../app/widgets/gimpcolorframe.c:415
+#: ../app/widgets/gimpcolorframe.c:508
 msgid "Index:"
 msgstr "�ั��ี:"
 
-#: ../app/widgets/gimpcolorframe.c:419 ../app/widgets/gimpcolorframe.c:440
+#: ../app/widgets/gimpcolorframe.c:521 ../app/widgets/gimpcolorframe.c:547
 msgid "Red:"
 msgstr "���:"
 
-#: ../app/widgets/gimpcolorframe.c:420 ../app/widgets/gimpcolorframe.c:441
+#: ../app/widgets/gimpcolorframe.c:522 ../app/widgets/gimpcolorframe.c:548
 msgid "Green:"
 msgstr "��ียว:"
 
-#: ../app/widgets/gimpcolorframe.c:421 ../app/widgets/gimpcolorframe.c:442
+#: ../app/widgets/gimpcolorframe.c:523 ../app/widgets/gimpcolorframe.c:549
 msgid "Blue:"
 msgstr "��ำ��ิ�:"
 
-#: ../app/widgets/gimpcolorframe.c:431 ../app/widgets/gimpcolorframe.c:462
+#: ../app/widgets/gimpcolorframe.c:536 ../app/widgets/gimpcolorframe.c:569
 msgid "Value:"
 msgstr "��า:"
 
-#: ../app/widgets/gimpcolorframe.c:450
+#: ../app/widgets/gimpcolorframe.c:560
 msgid "Hex:"
 msgstr "�า�สิ�ห�:"
 
-#: ../app/widgets/gimpcolorframe.c:460
+#: ../app/widgets/gimpcolorframe.c:567
 msgid "Hue:"
 msgstr "�า�ุสี:"
 
-#: ../app/widgets/gimpcolorframe.c:461
+#: ../app/widgets/gimpcolorframe.c:568
 msgid "Sat.:"
 msgstr "�วามอิ�มสี:"
 
-#: ../app/widgets/gimpcolorframe.c:478
+#: ../app/widgets/gimpcolorframe.c:586
 msgid "Cyan:"
 msgstr ""
 
-#: ../app/widgets/gimpcolorframe.c:479
+#: ../app/widgets/gimpcolorframe.c:587
 msgid "Magenta:"
 msgstr ""
 
-#: ../app/widgets/gimpcolorframe.c:480
+#: ../app/widgets/gimpcolorframe.c:588
 msgid "Yellow:"
 msgstr "�หลือ�:"
 
-#: ../app/widgets/gimpcolorframe.c:481
+#: ../app/widgets/gimpcolorframe.c:589
 msgid "Black:"
 msgstr "�ำ:"
 
-#: ../app/widgets/gimpcolorframe.c:495
+#: ../app/widgets/gimpcolorframe.c:609
 msgid "Alpha:"
 msgstr "อัล�า:"
 
-#: ../app/widgets/gimpcolorframe.c:513 ../app/widgets/gimpcursorview.c:133
-#: ../app/widgets/gimpcursorview.c:139 ../app/widgets/gimpcursorview.c:155
-#: ../app/widgets/gimpcursorview.c:161 ../app/widgets/gimpcursorview.c:424
-#: ../app/widgets/gimpcursorview.c:425 ../app/widgets/gimpcursorview.c:426
-#: ../app/widgets/gimpcursorview.c:427
-msgid "n/a"
-msgstr ""
-
-#: ../app/widgets/gimpcolormapeditor.c:205
+#: ../app/widgets/gimpcolormapeditor.c:223
 msgid "Color index:"
 msgstr "�ั��ีสี:"
 
-#: ../app/widgets/gimpcolormapeditor.c:215
+#: ../app/widgets/gimpcolormapeditor.c:233
 msgid "HTML notation:"
 msgstr "�ั��ึ��วาม�า� HTML:"
 
-#: ../app/widgets/gimpcontainerpopup.c:534
+#: ../app/widgets/gimpcolormapeditor.c:487
+msgid "Only indexed images have a colormap."
+msgstr ""
+
+#: ../app/widgets/gimpcolorselectorpalette.c:58
+#, fuzzy
+#| msgid "Palettes"
+msgid "Palette"
+msgstr "�า�สี"
+
+#: ../app/widgets/gimpcontainerpopup.c:547
 msgid "Smaller Previews"
 msgstr "ย�อ�าร�ส��"
 
-#: ../app/widgets/gimpcontainerpopup.c:539
+#: ../app/widgets/gimpcontainerpopup.c:552
 msgid "Larger Previews"
 msgstr "�ยาย�าร�ส��"
 
-#: ../app/widgets/gimpcontrollereditor.c:196
+#: ../app/widgets/gimpcontrollereditor.c:201
 #, fuzzy
 msgid "_Dump events from this controller"
 msgstr "ล��ิล��อร��ี��ลือ�ออ��า���ราย�าร�อ��ิล��อร��ี��ำลั�����า�"
 
-#: ../app/widgets/gimpcontrollereditor.c:201
+#: ../app/widgets/gimpcontrollereditor.c:206
 #, fuzzy
 msgid "_Enable this controller"
 msgstr "��ิ�����ัว�ว��ุม�ี�"
 
-#: ../app/widgets/gimpcontrollereditor.c:222
+#: ../app/widgets/gimpcontrollereditor.c:227
 msgid "Name:"
 msgstr "�ื�อ:"
 
-#: ../app/widgets/gimpcontrollereditor.c:373
+#: ../app/widgets/gimpcontrollereditor.c:233
+msgid "State:"
+msgstr "ส�า�ะ:"
+
+#: ../app/widgets/gimpcontrollereditor.c:338
 msgid "Event"
 msgstr "�ห�ุ�าร��"
 
-#: ../app/widgets/gimpcontrollereditor.c:398
+#: ../app/widgets/gimpcontrollereditor.c:363
 #, fuzzy
 msgid "_Grab event"
 msgstr "สี�_ร��า"
 
-#: ../app/widgets/gimpcontrollereditor.c:408
+#: ../app/widgets/gimpcontrollereditor.c:372
 msgid "Select the next event arriving from the controller"
 msgstr ""
 
-#: ../app/widgets/gimpcontrollereditor.c:565
+#: ../app/widgets/gimpcontrollereditor.c:530
 #, c-format
 msgid "Remove the action assigned to '%s'"
 msgstr ""
 
-#: ../app/widgets/gimpcontrollereditor.c:569
+#: ../app/widgets/gimpcontrollereditor.c:535
 #, c-format
 msgid "Assign an action to '%s'"
 msgstr ""
 
-#: ../app/widgets/gimpcontrollereditor.c:691
+#: ../app/widgets/gimpcontrollereditor.c:656
 #, fuzzy, c-format
 msgid "Select Action for Event '%s'"
-msgstr "ราย�าร�ัว������าร�ลือ��ื���ี�"
+msgstr "ราย�าร��รื�อ�มือ������าร�ลือ��ื���ี�"
 
-#: ../app/widgets/gimpcontrollereditor.c:696
+#: ../app/widgets/gimpcontrollereditor.c:661
 msgid "Select Controller Event Action"
 msgstr ""
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:71
-#: ../app/widgets/gimpcontrollerkeyboard.c:74
-#: ../app/widgets/gimpcontrollerkeyboard.c:77
-#: ../app/widgets/gimpcontrollerkeyboard.c:80
-#: ../app/widgets/gimpcontrollerkeyboard.c:83
-#: ../app/widgets/gimpcontrollerkeyboard.c:86
-#: ../app/widgets/gimpcontrollerkeyboard.c:89
-#: ../app/widgets/gimpcontrollerkeyboard.c:92
+#: ../app/widgets/gimpcontrollerkeyboard.c:69
+#: ../app/widgets/gimpcontrollerkeyboard.c:72
+#: ../app/widgets/gimpcontrollerkeyboard.c:75
+#: ../app/widgets/gimpcontrollerkeyboard.c:78
+#: ../app/widgets/gimpcontrollerkeyboard.c:81
+#: ../app/widgets/gimpcontrollerkeyboard.c:84
+#: ../app/widgets/gimpcontrollerkeyboard.c:87
+#: ../app/widgets/gimpcontrollerkeyboard.c:90
 #, fuzzy
 msgid "Cursor Up"
 msgstr "��อร���อร�"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:96
-#: ../app/widgets/gimpcontrollerkeyboard.c:99
-#: ../app/widgets/gimpcontrollerkeyboard.c:102
-#: ../app/widgets/gimpcontrollerkeyboard.c:105
-#: ../app/widgets/gimpcontrollerkeyboard.c:108
-#: ../app/widgets/gimpcontrollerkeyboard.c:111
-#: ../app/widgets/gimpcontrollerkeyboard.c:114
-#: ../app/widgets/gimpcontrollerkeyboard.c:117
+#: ../app/widgets/gimpcontrollerkeyboard.c:94
+#: ../app/widgets/gimpcontrollerkeyboard.c:97
+#: ../app/widgets/gimpcontrollerkeyboard.c:100
+#: ../app/widgets/gimpcontrollerkeyboard.c:103
+#: ../app/widgets/gimpcontrollerkeyboard.c:106
+#: ../app/widgets/gimpcontrollerkeyboard.c:109
+#: ../app/widgets/gimpcontrollerkeyboard.c:112
+#: ../app/widgets/gimpcontrollerkeyboard.c:115
 #, fuzzy
 msgid "Cursor Down"
 msgstr "��อร���อร�"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:121
-#: ../app/widgets/gimpcontrollerkeyboard.c:124
-#: ../app/widgets/gimpcontrollerkeyboard.c:127
-#: ../app/widgets/gimpcontrollerkeyboard.c:130
-#: ../app/widgets/gimpcontrollerkeyboard.c:133
-#: ../app/widgets/gimpcontrollerkeyboard.c:136
-#: ../app/widgets/gimpcontrollerkeyboard.c:139
-#: ../app/widgets/gimpcontrollerkeyboard.c:142
+#: ../app/widgets/gimpcontrollerkeyboard.c:119
+#: ../app/widgets/gimpcontrollerkeyboard.c:122
+#: ../app/widgets/gimpcontrollerkeyboard.c:125
+#: ../app/widgets/gimpcontrollerkeyboard.c:128
+#: ../app/widgets/gimpcontrollerkeyboard.c:131
+#: ../app/widgets/gimpcontrollerkeyboard.c:134
+#: ../app/widgets/gimpcontrollerkeyboard.c:137
+#: ../app/widgets/gimpcontrollerkeyboard.c:140
 #, fuzzy
 msgid "Cursor Left"
 msgstr "��อร���อร�"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:146
-#: ../app/widgets/gimpcontrollerkeyboard.c:149
-#: ../app/widgets/gimpcontrollerkeyboard.c:152
-#: ../app/widgets/gimpcontrollerkeyboard.c:155
-#: ../app/widgets/gimpcontrollerkeyboard.c:158
-#: ../app/widgets/gimpcontrollerkeyboard.c:161
-#: ../app/widgets/gimpcontrollerkeyboard.c:164
-#: ../app/widgets/gimpcontrollerkeyboard.c:167
+#: ../app/widgets/gimpcontrollerkeyboard.c:144
+#: ../app/widgets/gimpcontrollerkeyboard.c:147
+#: ../app/widgets/gimpcontrollerkeyboard.c:150
+#: ../app/widgets/gimpcontrollerkeyboard.c:153
+#: ../app/widgets/gimpcontrollerkeyboard.c:156
+#: ../app/widgets/gimpcontrollerkeyboard.c:159
+#: ../app/widgets/gimpcontrollerkeyboard.c:162
+#: ../app/widgets/gimpcontrollerkeyboard.c:165
 #, fuzzy
 msgid "Cursor Right"
 msgstr "�ลือ��วา"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:179
+#: ../app/widgets/gimpcontrollerkeyboard.c:177
 msgid "Keyboard"
 msgstr "�����ิม��"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:222
+#: ../app/widgets/gimpcontrollerkeyboard.c:221
 msgid "Keyboard Events"
 msgstr "สภาวะ�����ิม��"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:223
-#: ../app/widgets/gimpcontrollerwheel.c:222
+#: ../app/widgets/gimpcontrollerkeyboard.c:222
+#: ../app/widgets/gimpcontrollerwheel.c:224
 msgid "Ready"
 msgstr "�ร�อม"
 
-#: ../app/widgets/gimpcontrollerlist.c:183
+#: ../app/widgets/gimpcontrollerlist.c:181
 #, fuzzy
 msgid "Available Controllers"
 msgstr "�ิล��อร��ี�������"
 
-#: ../app/widgets/gimpcontrollerlist.c:275
+#: ../app/widgets/gimpcontrollerlist.c:273
 #, fuzzy
 msgid "Active Controllers"
 msgstr "�ิล��อร��ี��ำลั��ำ�า�"
 
-#: ../app/widgets/gimpcontrollerlist.c:291
+#: ../app/widgets/gimpcontrollerlist.c:289
 #, fuzzy
 msgid "Configure the selected controller"
 msgstr "�ำห����า�ิล��อร��ี��ลือ�"
 
-#: ../app/widgets/gimpcontrollerlist.c:299
+#: ../app/widgets/gimpcontrollerlist.c:297
 #, fuzzy
 msgid "Move the selected controller up"
 msgstr "�ลื�อ��ิล��อร��ี��ลือ��ี��"
 
-#: ../app/widgets/gimpcontrollerlist.c:307
+#: ../app/widgets/gimpcontrollerlist.c:305
 #, fuzzy
 msgid "Move the selected controller down"
 msgstr "�ลื�อ��ิล��อร��ี��ลือ�ล�"
@@ -10941,41 +15585,41 @@ msgstr "��ิ�ม�ิล��อร��ี��ลือ����
 msgid "Remove '%s' from the list of active controllers"
 msgstr "ล��ิล��อร��ี��ลือ�ออ��า���ราย�าร�อ��ิล��อร��ี��ำลั�����า�"
 
-#: ../app/widgets/gimpcontrollerlist.c:513
+#: ../app/widgets/gimpcontrollerlist.c:514
 msgid ""
 "There can only be one active keyboard controller.\n"
 "\n"
 "You already have a keyboard controller in your list of active controllers."
 msgstr ""
 
-#: ../app/widgets/gimpcontrollerlist.c:523
+#: ../app/widgets/gimpcontrollerlist.c:525
 msgid ""
 "There can only be one active wheel controller.\n"
 "\n"
 "You already have a wheel controller in your list of active controllers."
 msgstr ""
 
-#: ../app/widgets/gimpcontrollerlist.c:550
+#: ../app/widgets/gimpcontrollerlist.c:551
 #, fuzzy
 msgid "Remove Controller?"
 msgstr "ล�_อั��ั�"
 
-#: ../app/widgets/gimpcontrollerlist.c:555
+#: ../app/widgets/gimpcontrollerlist.c:556
 #, fuzzy
 msgid "Disable Controller"
 msgstr "��ิ�����ัว�ว��ุม�ี�"
 
-#: ../app/widgets/gimpcontrollerlist.c:557
+#: ../app/widgets/gimpcontrollerlist.c:558
 #, fuzzy
 msgid "Remove Controller"
 msgstr "ล�_อั��ั�"
 
-#: ../app/widgets/gimpcontrollerlist.c:568
+#: ../app/widgets/gimpcontrollerlist.c:570
 #, fuzzy, c-format
 msgid "Remove Controller '%s'?"
 msgstr "�ื�ภา� '%s' สู� '%s'?"
 
-#: ../app/widgets/gimpcontrollerlist.c:572
+#: ../app/widgets/gimpcontrollerlist.c:574
 msgid ""
 "Removing this controller from the list of active controllers will "
 "permanently delete all event mappings you have configured.\n"
@@ -10984,503 +15628,680 @@ msgid ""
 "removing it."
 msgstr ""
 
-#: ../app/widgets/gimpcontrollerlist.c:634
-#, fuzzy
-msgid "Configure Controller"
-msgstr "�รั����ห��า��า��ัว�รอ�สี"
-
-#: ../app/widgets/gimpcontrollerlist.c:637
+#: ../app/widgets/gimpcontrollerlist.c:626
 msgid "Configure Input Controller"
 msgstr ""
 
-#: ../app/widgets/gimpcontrollerwheel.c:70
-#: ../app/widgets/gimpcontrollerwheel.c:73
-#: ../app/widgets/gimpcontrollerwheel.c:76
-#: ../app/widgets/gimpcontrollerwheel.c:79
-#: ../app/widgets/gimpcontrollerwheel.c:82
-#: ../app/widgets/gimpcontrollerwheel.c:85
-#: ../app/widgets/gimpcontrollerwheel.c:88
-#: ../app/widgets/gimpcontrollerwheel.c:91
+#: ../app/widgets/gimpcontrollerwheel.c:71
+#: ../app/widgets/gimpcontrollerwheel.c:74
+#: ../app/widgets/gimpcontrollerwheel.c:77
+#: ../app/widgets/gimpcontrollerwheel.c:80
+#: ../app/widgets/gimpcontrollerwheel.c:83
+#: ../app/widgets/gimpcontrollerwheel.c:86
+#: ../app/widgets/gimpcontrollerwheel.c:89
+#: ../app/widgets/gimpcontrollerwheel.c:92
 msgid "Scroll Up"
 msgstr "�ลื�อ��ึ��"
 
-#: ../app/widgets/gimpcontrollerwheel.c:95
-#: ../app/widgets/gimpcontrollerwheel.c:98
-#: ../app/widgets/gimpcontrollerwheel.c:101
-#: ../app/widgets/gimpcontrollerwheel.c:104
-#: ../app/widgets/gimpcontrollerwheel.c:107
-#: ../app/widgets/gimpcontrollerwheel.c:110
-#: ../app/widgets/gimpcontrollerwheel.c:113
-#: ../app/widgets/gimpcontrollerwheel.c:116
+#: ../app/widgets/gimpcontrollerwheel.c:96
+#: ../app/widgets/gimpcontrollerwheel.c:99
+#: ../app/widgets/gimpcontrollerwheel.c:102
+#: ../app/widgets/gimpcontrollerwheel.c:105
+#: ../app/widgets/gimpcontrollerwheel.c:108
+#: ../app/widgets/gimpcontrollerwheel.c:111
+#: ../app/widgets/gimpcontrollerwheel.c:114
+#: ../app/widgets/gimpcontrollerwheel.c:117
 msgid "Scroll Down"
 msgstr "�ลื�อ�ล�"
 
-#: ../app/widgets/gimpcontrollerwheel.c:120
-#: ../app/widgets/gimpcontrollerwheel.c:123
-#: ../app/widgets/gimpcontrollerwheel.c:126
-#: ../app/widgets/gimpcontrollerwheel.c:129
-#: ../app/widgets/gimpcontrollerwheel.c:132
-#: ../app/widgets/gimpcontrollerwheel.c:135
-#: ../app/widgets/gimpcontrollerwheel.c:138
-#: ../app/widgets/gimpcontrollerwheel.c:141
+#: ../app/widgets/gimpcontrollerwheel.c:121
+#: ../app/widgets/gimpcontrollerwheel.c:124
+#: ../app/widgets/gimpcontrollerwheel.c:127
+#: ../app/widgets/gimpcontrollerwheel.c:130
+#: ../app/widgets/gimpcontrollerwheel.c:133
+#: ../app/widgets/gimpcontrollerwheel.c:136
+#: ../app/widgets/gimpcontrollerwheel.c:139
+#: ../app/widgets/gimpcontrollerwheel.c:142
 msgid "Scroll Left"
 msgstr "�ลื�อ���าย"
 
-#: ../app/widgets/gimpcontrollerwheel.c:145
-#: ../app/widgets/gimpcontrollerwheel.c:148
-#: ../app/widgets/gimpcontrollerwheel.c:151
-#: ../app/widgets/gimpcontrollerwheel.c:154
-#: ../app/widgets/gimpcontrollerwheel.c:157
-#: ../app/widgets/gimpcontrollerwheel.c:160
-#: ../app/widgets/gimpcontrollerwheel.c:163
-#: ../app/widgets/gimpcontrollerwheel.c:166
+#: ../app/widgets/gimpcontrollerwheel.c:146
+#: ../app/widgets/gimpcontrollerwheel.c:149
+#: ../app/widgets/gimpcontrollerwheel.c:152
+#: ../app/widgets/gimpcontrollerwheel.c:155
+#: ../app/widgets/gimpcontrollerwheel.c:158
+#: ../app/widgets/gimpcontrollerwheel.c:161
+#: ../app/widgets/gimpcontrollerwheel.c:164
+#: ../app/widgets/gimpcontrollerwheel.c:167
 msgid "Scroll Right"
 msgstr "�ลือ��วา"
 
-#: ../app/widgets/gimpcontrollerwheel.c:178
+#: ../app/widgets/gimpcontrollerwheel.c:179
 msgid "Mouse Wheel"
 msgstr "ล�อ�ม�าส�"
 
-#: ../app/widgets/gimpcontrollerwheel.c:221
+#: ../app/widgets/gimpcontrollerwheel.c:223
 msgid "Mouse Wheel Events"
 msgstr "ส�า�ะล�อ�ม�าส�"
 
-#: ../app/widgets/gimpcursorview.c:145
-msgid "Units"
-msgstr "ห��วย"
-
-#: ../app/widgets/gimpdataeditor.c:203
+#: ../app/widgets/gimpdataeditor.c:221
 msgid "Save"
 msgstr "�ั��ึ�"
 
-#: ../app/widgets/gimpdataeditor.c:211
+#: ../app/widgets/gimpdataeditor.c:229
 msgid "Revert"
 msgstr "�ลั��ื�"
 
-#: ../app/widgets/gimpdataeditor.c:410
+#: ../app/widgets/gimpdataeditor.c:445
 #, c-format
 msgid "%s (read only)"
 msgstr ""
 
-#: ../app/widgets/gimpdevicestatus.c:138
+#: ../app/widgets/gimpdeviceeditor.c:161
+#, fuzzy
+#| msgid "Delete the selected template"
+msgid "Delete the selected device"
+msgstr "ล���า��า��ม�����ี��ลือ�"
+
+#: ../app/widgets/gimpdeviceeditor.c:469
+#, fuzzy
+#| msgid "_Delete Saved Options"
+msgid "Delete Device Settings"
+msgstr "_ล��ัว�ลือ��ี��ั��ึ�"
+
+#: ../app/widgets/gimpdeviceeditor.c:490
+#, fuzzy, c-format
+#| msgid "Delete brush"
+msgid "Delete \"%s\"?"
+msgstr "ล�หัว��ร�"
+
+#: ../app/widgets/gimpdeviceeditor.c:493
+msgid ""
+"You are about to delete this device's stored settings.\n"
+"The next time this device is plugged, default settings will be used."
+msgstr ""
+
+#: ../app/widgets/gimpdeviceinfoeditor.c:142
+#: ../app/widgets/gimpdynamicseditor.c:148
+#: ../app/widgets/gimpdynamicsoutputeditor.c:213
+#, fuzzy
+#| msgid "Pressure:"
+msgid "Pressure"
+msgstr "�ร��ั�:"
+
+#: ../app/widgets/gimpdeviceinfoeditor.c:143
+msgid "X tilt"
+msgstr ""
+
+#: ../app/widgets/gimpdeviceinfoeditor.c:144
+msgid "Y tilt"
+msgstr ""
+
+#: ../app/widgets/gimpdeviceinfoeditor.c:145
+#: ../app/widgets/gimpdynamicseditor.c:152
+#: ../app/widgets/gimpdynamicsoutputeditor.c:241
+#, fuzzy
+#| msgid "Mouse Wheel"
+msgid "Wheel"
+msgstr "ล�อ�ม�าส�"
+
+#. the axes
+#: ../app/widgets/gimpdeviceinfoeditor.c:192
+#, fuzzy
+#| msgid "pixels"
+msgid "Axes"
+msgstr "�ุ�ภา�"
+
+#. the keys
+#: ../app/widgets/gimpdeviceinfoeditor.c:266
+msgid "Keys"
+msgstr ""
+
+#: ../app/widgets/gimpdeviceinfoeditor.c:366
+#: ../app/widgets/gimpdeviceinfoeditor.c:584
+#, fuzzy, c-format
+#| msgid "None"
+msgid "none"
+msgstr "�ม�มี"
+
+#: ../app/widgets/gimpdeviceinfoeditor.c:414
+#, fuzzy, c-format
+#| msgid "_Curved"
+msgid "%s Curve"
+msgstr "�ิ��_���"
+
+#: ../app/widgets/gimpdeviceinfoeditor.c:473
+#: ../app/widgets/gimpdynamicsoutputeditor.c:196
+#, fuzzy
+msgid "_Reset Curve"
+msgstr "�ั����าสี�หม�"
+
+#: ../app/widgets/gimpdeviceinfoeditor.c:486
+#, c-format
+msgid "The axis '%s' has no curve"
+msgstr ""
+
+#: ../app/widgets/gimpdevicestatus.c:139
 msgid "Save device status"
 msgstr "�ั��ึ�ส�า�ะอุ��ร��"
 
-#: ../app/widgets/gimpdevicestatus.c:446
+#: ../app/widgets/gimpdevicestatus.c:448
 #, c-format
 msgid "Foreground: %d, %d, %d"
 msgstr "�ื��ห��า: %d, %d, %d"
 
-#: ../app/widgets/gimpdevicestatus.c:451
+#: ../app/widgets/gimpdevicestatus.c:453
 #, c-format
 msgid "Background: %d, %d, %d"
 msgstr "�ื��หลั�: %d, %d, %d"
 
-#: ../app/widgets/gimpdnd-xds.c:189
+#: ../app/widgets/gimpdnd-xds.c:203
 msgid "The given filename does not have any known file extension."
 msgstr ""
 
-#: ../app/widgets/gimpdnd-xds.c:207
+#: ../app/widgets/gimpdnd-xds.c:221
 #, fuzzy
 msgid "File Exists"
 msgstr "มี���มอยู�"
 
-#: ../app/widgets/gimpdnd-xds.c:212
+#: ../app/widgets/gimpdnd-xds.c:226
 msgid "_Replace"
 msgstr "�_���ี�"
 
-#: ../app/widgets/gimpdnd-xds.c:223
+#: ../app/widgets/gimpdnd-xds.c:237
 #, c-format
 msgid "A file named '%s' already exists."
 msgstr "มี���ม�ื�อ %s อยู��ล�ว"
 
-#: ../app/widgets/gimpdnd-xds.c:228
+#: ../app/widgets/gimpdnd-xds.c:242
 msgid "Do you want to replace it with the image you are saving?"
 msgstr "��า���อ��าร����ี���วยภา��ี��ำลั��ั��ึ�หรือ�ม�?"
 
-#: ../app/widgets/gimpdock.c:287
-#, fuzzy
-msgid "Close all Tabs?"
-msgstr "�ิ��ุ�สำรั��า�"
-
-#: ../app/widgets/gimpdock.c:293
-msgid "Close all Tabs"
-msgstr "�ิ��ุ�สำรั��า�"
+#. String used to separate dockables, e.g. "Tool Options, Layers"
+#: ../app/widgets/gimpdock.h:34
+msgctxt "dock"
+msgid ", "
+msgstr ""
 
-#: ../app/widgets/gimpdock.c:303
-msgid "Close all tabs?"
-msgstr "�ิ��ุ�สำรั��า�หรือ�ม�?"
+#. String used to separate books (GtkNotebooks) within a dock,
+#. e.g. "Tool Options, Layers - Brushes"
+#.
+#: ../app/widgets/gimpdock.h:39
+msgctxt "dock"
+msgid " - "
+msgstr ""
 
-#: ../app/widgets/gimpdock.c:306
-#, fuzzy, c-format
-msgid ""
-"This window has %d tab open. Closing the window will also close all its tabs."
-msgid_plural ""
-"This window has %d tabs open. Closing the window will also close all its "
-"tabs."
-msgstr[0] "ห��า��า��ี�มีสำรั� %d สำรั���ิ�อยู� หา��ิ�ห��า��า�สำรั��า�อื���ะ�ิ���วย"
-msgstr[1] "ห��า��า��ี�มีสำรั� %d สำรั���ิ�อยู� หา��ิ�ห��า��า�สำรั��า�อื���ะ�ิ���วย"
+#. String used to separate dock columns,
+#. e.g. "Tool Options, Layers - Brushes | Gradients"
+#.
+#: ../app/widgets/gimpdock.h:44
+msgctxt "dock"
+msgid " | "
+msgstr ""
 
-#: ../app/widgets/gimpdockable.c:166
+#: ../app/widgets/gimpdockable.c:235
 #, fuzzy
 msgid "Configure this tab"
 msgstr "�รั�������า�ส���ิ�ั�"
 
-#: ../app/widgets/gimpdockseparator.c:44
-msgid "You can drop dockable dialogs here."
-msgstr "��า�สามาร�วา��ล�อ�����อ��ี�สามาร�วา���ื�อม����ี��ี�"
+#. Auto button
+#: ../app/widgets/gimpdockwindow.c:351
+msgid "Auto"
+msgstr "อั���มั�ิ"
 
-#: ../app/widgets/gimperrorconsole.c:204 ../app/widgets/gimperrordialog.c:174
-#, c-format
-msgid "%s Message"
-msgstr "��อ�วาม %s"
+#: ../app/widgets/gimpdockwindow.c:362
+msgid ""
+"When enabled the dialog automatically follows the image you are working on."
+msgstr "�มื�อ��ิ�����า� �ล�อ�����อ��ะ�ิ��ามภา��ี��ุ��ำลั��ำ�า���วย��ยอั���มั�ิ"
 
-#: ../app/widgets/gimperrordialog.c:151
+#: ../app/widgets/gimpdrawabletreeview.c:124
+#, fuzzy
+#| msgid "pixels"
+msgid "Lock pixels"
+msgstr "�ุ�ภา�"
+
+#: ../app/widgets/gimpdynamicseditor.c:133
+#: ../app/widgets/gimpdynamicseditor.c:139
+msgid "Mapping matrix"
+msgstr ""
+
+#: ../app/widgets/gimpdynamicseditor.c:149
+#: ../app/widgets/gimpdynamicsoutputeditor.c:220
+msgid "Velocity"
+msgstr ""
+
+#: ../app/widgets/gimpdynamicseditor.c:151
+#: ../app/widgets/gimpdynamicsoutputeditor.c:234
+#, fuzzy
+#| msgid "Tilt:"
+msgid "Tilt"
+msgstr "�อีย�:"
+
+#: ../app/widgets/gimpdynamicseditor.c:153
+#: ../app/widgets/gimpdynamicsoutputeditor.c:248
+#, fuzzy
+#| msgid "Undo"
+msgid "Random"
+msgstr "�ลั��ื�"
+
+#: ../app/widgets/gimpdynamicseditor.c:154
+#: ../app/widgets/gimpdynamicsoutputeditor.c:255
+#, fuzzy
+#| msgid "Fade out"
+msgid "Fade"
+msgstr "�า�ล�"
+
+#: ../app/widgets/gimperrordialog.c:150
 msgid "Too many error messages!"
 msgstr "มี��อ�วาม�ส���วาม�ิ��ลา�มา���!"
 
-#: ../app/widgets/gimperrordialog.c:152
+#: ../app/widgets/gimperrordialog.c:151
 msgid "Messages are redirected to stderr."
 msgstr ""
 
-#: ../app/widgets/gimpfiledialog.c:267
+#: ../app/widgets/gimperrordialog.c:170
+#, c-format
+msgid "%s Message"
+msgstr "��อ�วาม %s"
+
+#: ../app/widgets/gimpfiledialog.c:326
 msgid "Automatically Detected"
 msgstr "�รว������ยอั���มั�ิ"
 
-#: ../app/widgets/gimpfiledialog.c:277
+#: ../app/widgets/gimpfiledialog.c:343
 msgid "By Extension"
 msgstr "�ามส�ว��ยาย"
 
-#: ../app/widgets/gimpfiledialog.c:454
+#: ../app/widgets/gimpfiledialog.c:799
 #, fuzzy
 msgid "All files"
 msgstr "�ุ����ม"
 
-#: ../app/widgets/gimpfiledialog.c:459
+#: ../app/widgets/gimpfiledialog.c:804
 #, fuzzy
 msgid "All images"
 msgstr "�ุ����ม"
 
-#: ../app/widgets/gimpfiledialog.c:595
+#: ../app/widgets/gimpfiledialog.c:980
 #, c-format
 msgid "Select File _Type (%s)"
 msgstr "�ลือ�_��ิ����ม (%s)"
 
-#: ../app/widgets/gimpfileprocview.c:200
+#: ../app/widgets/gimpfileprocview.c:186
 msgid "File Type"
 msgstr "��ิ���ล�"
 
-#: ../app/widgets/gimpfileprocview.c:212
+#: ../app/widgets/gimpfileprocview.c:198
 msgid "Extensions"
 msgstr "ส�ว��ยาย"
 
-#: ../app/widgets/gimpgradienteditor.c:393
+#: ../app/widgets/gimpfilleditor.c:127
+#, fuzzy
+#| msgid "Fill with _FG Color"
+msgid "Fill Color"
+msgstr "��ิม��วยสี�ื��ห_��า"
+
+#: ../app/widgets/gimpfilleditor.c:145
+msgid "_Antialiasing"
+msgstr "_��อ��ั��อ�หยั�"
+
+#. Instant update toggle
+#: ../app/widgets/gimpgradienteditor.c:413
 msgid "Instant update"
 msgstr ""
 
-#: ../app/widgets/gimpgradienteditor.c:763
+#: ../app/widgets/gimpgradienteditor.c:775
 #, c-format
 msgid "Zoom factor: %d:1"
 msgstr ""
 
-#: ../app/widgets/gimpgradienteditor.c:766
+#: ../app/widgets/gimpgradienteditor.c:778
 #, c-format
-msgid "Displaying [%0.6f, %0.6f]"
+msgid "Displaying [%0.4f, %0.4f]"
 msgstr ""
 
-#: ../app/widgets/gimpgradienteditor.c:979
-#, c-format
-msgid "Position: %0.6f"
+#: ../app/widgets/gimpgradienteditor.c:997
+#, fuzzy, c-format
+#| msgid "Position: %0.6f"
+msgid "Position: %0.4f"
 msgstr "�ำ�ห���: %0.6f"
 
-#: ../app/widgets/gimpgradienteditor.c:980
+#: ../app/widgets/gimpgradienteditor.c:998
 #, c-format
 msgid "RGB (%0.3f, %0.3f, %0.3f)"
 msgstr "RGB (%0.3f, %0.3f, %0.3f)"
 
-#: ../app/widgets/gimpgradienteditor.c:982
-#, c-format
-msgid "HSV (%0.3f, %0.3f, %0.3f)"
+#: ../app/widgets/gimpgradienteditor.c:1000
+#, fuzzy, c-format
+#| msgid "HSV (%0.3f, %0.3f, %0.3f)"
+msgid "HSV (%0.1f, %0.1f, %0.1f)"
 msgstr "HSV (%0.3f, %0.3f, %0.3f)"
 
-#: ../app/widgets/gimpgradienteditor.c:984
+#: ../app/widgets/gimpgradienteditor.c:1002
 #, c-format
-msgid "Luminance: %0.3f    Opacity: %0.3f"
+msgid "Luminance: %0.1f    Opacity: %0.1f"
 msgstr ""
 
-#: ../app/widgets/gimpgradienteditor.c:1016
-#: ../app/widgets/gimpgradienteditor.c:1050
+#: ../app/widgets/gimpgradienteditor.c:1033
 #, c-format
 msgid "RGB (%d, %d, %d)"
 msgstr "RGB (%d, %d, %d)"
 
-#: ../app/widgets/gimpgradienteditor.c:1024
+#: ../app/widgets/gimpgradienteditor.c:1044
 msgid "Foreground color set to:"
 msgstr "�ุ�สี�ื��ห��า����:"
 
-#: ../app/widgets/gimpgradienteditor.c:1055
-#, c-format
-msgid "(%0.3f, %0.3f, %0.3f)"
-msgstr "(%0.3f, %0.3f, %0.3f)"
-
-#: ../app/widgets/gimpgradienteditor.c:1059
+#: ../app/widgets/gimpgradienteditor.c:1051
 msgid "Background color set to:"
 msgstr "�ุ�สี�ื��หลั�����:"
 
-#: ../app/widgets/gimpgradienteditor.c:1268
-#: ../app/widgets/gimpgradienteditor.c:1334
+#: ../app/widgets/gimpgradienteditor.c:1285
+#: ../app/widgets/gimpgradienteditor.c:1351
 #, c-format
 msgid "%s%sDrag: move & compress"
 msgstr "%s%sDrag: move & compress"
 
-#: ../app/widgets/gimpgradienteditor.c:1274
+#: ../app/widgets/gimpgradienteditor.c:1291
 msgid "Drag: move"
 msgstr "ลา�: �ลื�อ�"
 
-#: ../app/widgets/gimpgradienteditor.c:1281
-#: ../app/widgets/gimpgradienteditor.c:1295
-#: ../app/widgets/gimpgradienteditor.c:1309
-#: ../app/widgets/gimpgradienteditor.c:1331
+#: ../app/widgets/gimpgradienteditor.c:1298
+#: ../app/widgets/gimpgradienteditor.c:1312
+#: ../app/widgets/gimpgradienteditor.c:1326
+#: ../app/widgets/gimpgradienteditor.c:1348
 #, c-format
 msgid "%s%sClick: extend selection"
 msgstr "%s%s��: �ยาย�ื���ี��ลือ�"
 
-#: ../app/widgets/gimpgradienteditor.c:1287
-#: ../app/widgets/gimpgradienteditor.c:1301
+#: ../app/widgets/gimpgradienteditor.c:1304
+#: ../app/widgets/gimpgradienteditor.c:1318
 msgid "Click: select"
 msgstr "��: �ลือ�"
 
-#: ../app/widgets/gimpgradienteditor.c:1315
-#: ../app/widgets/gimpgradienteditor.c:1339
+#: ../app/widgets/gimpgradienteditor.c:1332
+#: ../app/widgets/gimpgradienteditor.c:1356
 msgid "Click: select    Drag: move"
 msgstr "��: �ลือ�    ลา�: �ลื�อ�"
 
-#: ../app/widgets/gimpgradienteditor.c:1554
-#: ../app/widgets/gimpgradienteditor.c:1562
-#, c-format
-msgid "Handle position: %0.6f"
-msgstr ""
-
+#: ../app/widgets/gimpgradienteditor.c:1571
 #: ../app/widgets/gimpgradienteditor.c:1579
-#, c-format
-msgid "Distance: %0.6f"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Position: %0.6f"
+msgid "Handle position: %0.4f"
+msgstr "�ำ�ห���: %0.6f"
+
+#: ../app/widgets/gimpgradienteditor.c:1596
+#, fuzzy, c-format
+#| msgid "Distance:"
+msgid "Distance: %0.4f"
+msgstr "ระยะ:"
 
-#: ../app/widgets/gimpgrideditor.c:209
+#: ../app/widgets/gimpgrideditor.c:216
 #, fuzzy
 msgid "Line _style:"
 msgstr "รู��_���ส��:"
 
-#: ../app/widgets/gimpgrideditor.c:213
+#: ../app/widgets/gimpgrideditor.c:220
 msgid "Change grid foreground color"
 msgstr "��ลี�ย�สี�ืิ��ห��า�ส���ิ�ั�"
 
-#: ../app/widgets/gimpgrideditor.c:220
+#: ../app/widgets/gimpgrideditor.c:227
 msgid "_Foreground color:"
 msgstr "สี�ื��_ห��า:"
 
-#: ../app/widgets/gimpgrideditor.c:224
+#: ../app/widgets/gimpgrideditor.c:231
 msgid "Change grid background color"
 msgstr "��ลี�ย�สี�ื��หลั��ส���ิ�ั�"
 
-#: ../app/widgets/gimpgrideditor.c:231
+#: ../app/widgets/gimpgrideditor.c:238
 msgid "_Background color:"
 msgstr "สี�ื��ห_ลั�:"
 
-#: ../app/widgets/gimpgrideditor.c:236
+#: ../app/widgets/gimpgrideditor.c:243
 msgid "Spacing"
 msgstr "ระยะห�า�"
 
-#: ../app/widgets/gimphelp.c:190
-msgid "Help browser not found"
-msgstr "�ม����ัว�รีย��ูราย�าร��วย�หลือ"
+#: ../app/widgets/gimpgrideditor.c:264 ../app/widgets/gimpgrideditor.c:296
+msgid "Width"
+msgstr "�ว�า�"
 
-#: ../app/widgets/gimphelp.c:191
-msgid "Could not find GIMP help browser."
-msgstr "�ม�สามาร�หา�ัว�รีย��ู�าร��วย�หลือ�อ� GIMP ���"
+#: ../app/widgets/gimpgrideditor.c:266 ../app/widgets/gimpgrideditor.c:298
+msgid "Height"
+msgstr "สู�"
+
+#: ../app/widgets/gimphelp.c:293
+#, fuzzy
+#| msgid "H_elp browser to use:"
+msgid "Help browser is missing"
+msgstr "��ราว��_�อร���วย�หลือ�ี��ะ���:"
+
+#: ../app/widgets/gimphelp.c:294
+#, fuzzy
+#| msgid "GIMP help browser"
+msgid "The GIMP help browser is not available."
+msgstr "�ัว�รีย��ูราย�าร��วย�หลือ GIMP"
 
-#: ../app/widgets/gimphelp.c:192
+#: ../app/widgets/gimphelp.c:295
+#, fuzzy
+#| msgid ""
+#| "The GIMP help browser plug-in appears to be missing from your "
+#| "installation."
 msgid ""
-"The GIMP help browser plug-in appears to be missing from your installation."
+"The GIMP help browser plug-in appears to be missing from your installation. "
+"You may instead use the web browser for reading the help pages."
 msgstr "��ร��รม�สริม�ัว�รีย��ู�าร��วย�หลือ�อ� GIMP สู�หาย�า��าร�ิ��ั��"
 
-#: ../app/widgets/gimphelp.c:218
+#: ../app/widgets/gimphelp.c:336
 msgid "Help browser doesn't start"
 msgstr "�ัว�รีย��ู�าร��วย�หลือ�ม��ำ�า�"
 
-#: ../app/widgets/gimphelp.c:219
+#: ../app/widgets/gimphelp.c:337
 msgid "Could not start the GIMP help browser plug-in."
 msgstr "��ร��รม�สริม�ัว�รีย��ู�าร��วย�หลือ�อ� GIMP �ม�สามาร��ริ�ม�า����"
 
-#: ../app/widgets/gimphelp.c:245
-msgid "Use _web browser instead"
-msgstr "����ัว�ู�_ว�����"
+#: ../app/widgets/gimphelp.c:364
+#, fuzzy
+#| msgid "Web Browser"
+msgid "Use _Web Browser"
+msgstr "�ว����ราว���อร�"
+
+#: ../app/widgets/gimphelp.c:610
+msgid "GIMP user manual is missing"
+msgstr ""
+
+#: ../app/widgets/gimphelp.c:617
+msgid "_Read Online"
+msgstr ""
+
+#: ../app/widgets/gimphelp.c:641
+msgid "The GIMP user manual is not installed on your computer."
+msgstr ""
+
+#: ../app/widgets/gimphelp.c:644
+msgid ""
+"You may either install the additional help package or change your "
+"preferences to use the online version."
+msgstr ""
 
-#: ../app/widgets/gimphistogrameditor.c:98
+#: ../app/widgets/gimphistogrameditor.c:99
 msgid "Mean:"
 msgstr "��า��ลี�ย:"
 
-#: ../app/widgets/gimphistogrameditor.c:99
+#: ../app/widgets/gimphistogrameditor.c:100
 #, fuzzy
 msgid "Std dev:"
 msgstr "ส�ว���ี�ย����มา�ร�า�:"
 
-#: ../app/widgets/gimphistogrameditor.c:100
+#: ../app/widgets/gimphistogrameditor.c:101
 msgid "Median:"
 msgstr "มั�ย�า�:"
 
-#: ../app/widgets/gimphistogrameditor.c:101
+#: ../app/widgets/gimphistogrameditor.c:102
 msgid "Pixels:"
 msgstr "�ุ�ภา�:"
 
-#: ../app/widgets/gimphistogrameditor.c:102
+#: ../app/widgets/gimphistogrameditor.c:103
 msgid "Count:"
 msgstr ""
 
-#: ../app/widgets/gimphistogrameditor.c:103
+#: ../app/widgets/gimphistogrameditor.c:104
 msgid "Percentile:"
 msgstr "��อร���������ล�:"
 
-#: ../app/widgets/gimphistogrameditor.c:120
+#: ../app/widgets/gimphistogrameditor.c:122
 msgid "Channel:"
 msgstr "�����ล:"
 
-#: ../app/widgets/gimpimagepropview.c:171
-msgid "Pixel dimensions:"
-msgstr "�ำ�ว��ุ�ภา�:"
+#. Button
+#: ../app/widgets/gimpimagecommenteditor.c:107
+#, fuzzy
+msgid "Use default comment"
+msgstr "สี�ร_��ริ�ม"
+
+#: ../app/widgets/gimpimagecommenteditor.c:109
+msgid ""
+"Replace the current image comment with the default comment set in "
+"Editâ??Preferencesâ??Default Image."
+msgstr ""
+
+#: ../app/widgets/gimpimageprofileview.c:200
+msgid "Querying..."
+msgstr ""
+
+#: ../app/widgets/gimpimagepropview.c:122
+#, fuzzy
+#| msgid "Size in memory:"
+msgid "Size in pixels:"
+msgstr "��า���ห��วย�วาม�ำ:"
 
-#: ../app/widgets/gimpimagepropview.c:174
+#: ../app/widgets/gimpimagepropview.c:125
 msgid "Print size:"
 msgstr "��า��ิม��:"
 
-#: ../app/widgets/gimpimagepropview.c:177
+#: ../app/widgets/gimpimagepropview.c:128
 msgid "Resolution:"
 msgstr "�วามละ�อีย�:"
 
-#: ../app/widgets/gimpimagepropview.c:180
+#: ../app/widgets/gimpimagepropview.c:131
 #, fuzzy
 msgid "Color space:"
 msgstr "สม�ุลสี"
 
-#: ../app/widgets/gimpimagepropview.c:185
+#: ../app/widgets/gimpimagepropview.c:136
 #, fuzzy
 msgid "File Name:"
 msgstr "�ื�อ:"
 
-#: ../app/widgets/gimpimagepropview.c:188
+#: ../app/widgets/gimpimagepropview.c:142
 #, fuzzy
 msgid "File Size:"
 msgstr "��า��าย�ัว"
 
-#: ../app/widgets/gimpimagepropview.c:191
+#: ../app/widgets/gimpimagepropview.c:145
 #, fuzzy
 msgid "File Type:"
 msgstr "��ิ���ล�"
 
-#: ../app/widgets/gimpimagepropview.c:196
+#: ../app/widgets/gimpimagepropview.c:150
 msgid "Size in memory:"
 msgstr "��า���ห��วย�วาม�ำ:"
 
-#: ../app/widgets/gimpimagepropview.c:199
+#: ../app/widgets/gimpimagepropview.c:153
 #, fuzzy
 msgid "Undo steps:"
 msgstr "�_ลั��ื� %s"
 
-#: ../app/widgets/gimpimagepropview.c:202
+#: ../app/widgets/gimpimagepropview.c:156
 #, fuzzy
 msgid "Redo steps:"
 msgstr "_�ำ��ำ %s"
 
-#: ../app/widgets/gimpimagepropview.c:207
+#: ../app/widgets/gimpimagepropview.c:161
 #, fuzzy
 msgid "Number of pixels:"
 msgstr "�ำ�ว��ั���า�: "
 
-#: ../app/widgets/gimpimagepropview.c:210
+#: ../app/widgets/gimpimagepropview.c:164
 msgid "Number of layers:"
 msgstr "�ำ�ว��ั���า�: "
 
-#: ../app/widgets/gimpimagepropview.c:213
+#: ../app/widgets/gimpimagepropview.c:167
 #, fuzzy
 msgid "Number of channels:"
 msgstr "�ำ�ว��ั���า�: "
 
-#: ../app/widgets/gimpimagepropview.c:216
+#: ../app/widgets/gimpimagepropview.c:170
 #, fuzzy
 msgid "Number of paths:"
 msgstr "�ำ�ว��ั���า�: "
 
-#: ../app/widgets/gimpimagepropview.c:450
+#. no undo (or redo) steps available
+#: ../app/widgets/gimpimagepropview.c:416
+msgid "None"
+msgstr "�ม�มี"
+
+#: ../app/widgets/gimpimagepropview.c:470
 #, c-format
 msgid "pixels/%s"
 msgstr "�ุ�ภา�/%s"
 
-#: ../app/widgets/gimpimagepropview.c:452
+#: ../app/widgets/gimpimagepropview.c:472
 #, c-format
 msgid "%g Ã? %g %s"
 msgstr ""
 
-#: ../app/widgets/gimpimagepropview.c:472
+#: ../app/widgets/gimpimagepropview.c:493
 msgid "colors"
 msgstr "สี"
 
-#: ../app/widgets/gimpitemtreeview.c:977
+#: ../app/widgets/gimpitemtreeview.c:702
+msgid "Lock:"
+msgstr ""
+
+#: ../app/widgets/gimpitemtreeview.c:1417
 msgid "Set Item Exclusive Visible"
 msgstr ""
 
-#: ../app/widgets/gimpitemtreeview.c:985
+#: ../app/widgets/gimpitemtreeview.c:1425
 msgid "Set Item Exclusive Linked"
 msgstr ""
 
-#: ../app/widgets/gimplayertreeview.c:221
+#: ../app/widgets/gimplayertreeview.c:236
 msgid "Reorder Layer"
 msgstr "�ั��รีย��ั���า��หม�"
 
-#: ../app/widgets/gimplayertreeview.c:309
+#: ../app/widgets/gimplayertreeview.c:326
 #, fuzzy
 msgid "Lock alpha channel"
 msgstr "��อ�ภา�อัล_�า�อ��ั���า�"
 
-#: ../app/widgets/gimplayertreeview.c:321
-msgid "Lock:"
-msgstr ""
-
-#: ../app/widgets/gimplayertreeview.c:873
-msgid "Empty Layer"
-msgstr "�ั���า�ว�า�"
-
-#: ../app/widgets/gimpmenudock.c:159
-msgid "Auto"
-msgstr "อั���มั�ิ"
-
-#: ../app/widgets/gimpmenudock.c:170
-msgid ""
-"When enabled the dialog automatically follows the image you are working on."
-msgstr "�มื�อ��ิ�����า� �ล�อ�����อ��ะ�ิ��ามภา��ี��ุ��ำลั��ำ�า���วย��ยอั���มั�ิ"
-
-#: ../app/widgets/gimpmessagebox.c:437
+#: ../app/widgets/gimpmessagebox.c:442
 #, c-format
 msgid "Message repeated %d times."
 msgstr "�ว���อ�วาม���ล�ว %d �รั��"
 
-#: ../app/widgets/gimpmessagebox.c:439
+#: ../app/widgets/gimpmessagebox.c:444
 msgid "Message repeated once."
 msgstr "�ว���อ�วาม���รั����ียว"
 
-#: ../app/widgets/gimppaletteeditor.c:255
-#: ../app/widgets/gimppaletteeditor.c:791
+#: ../app/widgets/gimppaletteeditor.c:254
+#: ../app/widgets/gimppaletteeditor.c:745
 msgid "Undefined"
 msgstr "�ม�����ำห��"
 
-#: ../app/widgets/gimppaletteeditor.c:263
+#: ../app/widgets/gimppaletteeditor.c:262
 msgid "Columns:"
 msgstr "�อลัม��:"
 
-#: ../app/widgets/gimpprogressdialog.c:215
+#: ../app/widgets/gimpprofilechooserdialog.c:136
+msgid "ICC color profile (*.icc, *.icm)"
+msgstr ""
+
+#: ../app/widgets/gimpprogressdialog.c:221
 msgid "Progress"
 msgstr "�วาม�ื�ห��า"
 
-#: ../app/widgets/gimpselectiondata.c:258
+#: ../app/widgets/gimpselectiondata.c:249
 #, c-format
 msgid ""
 "The filename '%s' couldn't be converted to a valid URI:\n"
@@ -11491,10 +16312,76 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/widgets/gimpselectiondata.c:262
+#: ../app/widgets/gimpselectiondata.c:253
 msgid "Invalid UTF-8"
 msgstr "UTF-8 �ม��ู���อ�"
 
+#: ../app/widgets/gimpsettingsbox.c:241
+msgid "Pick a setting from the list"
+msgstr ""
+
+#: ../app/widgets/gimpsettingsbox.c:262
+msgid "Add settings to favorites"
+msgstr ""
+
+#: ../app/widgets/gimpsettingsbox.c:290
+#, fuzzy
+#| msgid "_Import Palette..."
+msgid "_Import Settings from File..."
+msgstr "_�ำ���า�า�สี..."
+
+#: ../app/widgets/gimpsettingsbox.c:296
+#, fuzzy
+#| msgid "_Save Error Log to File..."
+msgid "_Export Settings to File..."
+msgstr "_�ั��ึ��ูม��อ�ิ��ลา�ล����ม..."
+
+#: ../app/widgets/gimpsettingsbox.c:303
+#, fuzzy
+#| msgid "_Merge Palettes..."
+msgid "_Manage Settings..."
+msgstr "รวม_�า�สี..."
+
+#: ../app/widgets/gimpsettingsbox.c:590
+msgid "Add Settings to Favorites"
+msgstr ""
+
+#: ../app/widgets/gimpsettingsbox.c:593
+#, fuzzy
+#| msgid "Enter a name for the saved options"
+msgid "Enter a name for the settings"
+msgstr "��อ��ื�อสำหรั��ัว�ลือ��ี�����ั��ึ�"
+
+#: ../app/widgets/gimpsettingsbox.c:594
+#, fuzzy
+#| msgid "Saved Options"
+msgid "Saved Settings"
+msgstr "�ัว�ลือ��ี�����ั��ึ�"
+
+#: ../app/widgets/gimpsettingsbox.c:630
+#, fuzzy
+#| msgid "Re_name Saved Options"
+msgid "Manage Saved Settings"
+msgstr "�_�ลี�ย��ื�อ�ัว�ลือ��ี��ั��ึ�"
+
+#: ../app/widgets/gimpsettingseditor.c:174
+#, fuzzy
+#| msgid "Import Paths from SVG"
+msgid "Import settings from a file"
+msgstr "�ำ���า�ส���า��า� SVG"
+
+#: ../app/widgets/gimpsettingseditor.c:183
+#, fuzzy
+#| msgid "Copy the selected region to the clipboard"
+msgid "Export the selected settings to a file"
+msgstr "�ั�ลอ��อ�����ี��ลือ���ยั��ลิ��อร��"
+
+#: ../app/widgets/gimpsettingseditor.c:192
+#, fuzzy
+#| msgid "Delete the selected template"
+msgid "Delete the selected settings"
+msgstr "ล���า��า��ม�����ี��ลือ�"
+
 #: ../app/widgets/gimpsizebox.c:463
 #, fuzzy, c-format
 msgid "%d Ã? %d ppi"
@@ -11505,86 +16392,138 @@ msgstr "%d x %d dpi"
 msgid "%d ppi"
 msgstr "%d dpi"
 
-#: ../app/widgets/gimpstrokeeditor.c:180
+#: ../app/widgets/gimpstrokeeditor.c:187
 #, fuzzy
 msgid "Line width:"
 msgstr "�วาม�ว�า��ส��:"
 
-#: ../app/widgets/gimpstrokeeditor.c:196
+#: ../app/widgets/gimpstrokeeditor.c:199
 msgid "_Line Style"
 msgstr "รู��_���ส��"
 
-#: ../app/widgets/gimpstrokeeditor.c:215
+#: ../app/widgets/gimpstrokeeditor.c:218
 msgid "_Cap style:"
 msgstr "ลั�ษ�ะ_�ลาย�ส��:"
 
-#: ../app/widgets/gimpstrokeeditor.c:221
+#: ../app/widgets/gimpstrokeeditor.c:224
 msgid "_Join style:"
 msgstr "_ลั�ษ�ะ��อ��อ:"
 
-#: ../app/widgets/gimpstrokeeditor.c:226
+#: ../app/widgets/gimpstrokeeditor.c:229
 msgid "_Miter limit:"
 msgstr "ระ�ั��วาม�หลม:"
 
-#: ../app/widgets/gimpstrokeeditor.c:233
+#: ../app/widgets/gimpstrokeeditor.c:236
 msgid "Dash pattern:"
 msgstr "���ลาย�ี�:"
 
-#: ../app/widgets/gimpstrokeeditor.c:275
+#: ../app/widgets/gimpstrokeeditor.c:299
 #, fuzzy
 msgid "Dash _preset:"
 msgstr "�ุ�����ี�:"
 
-#: ../app/widgets/gimpstrokeeditor.c:296
-msgid "_Antialiasing"
-msgstr "_��อ��ั��อ�หยั�"
+#: ../app/widgets/gimptagentry.c:43
+#, fuzzy
+#| msgid "Miter"
+msgid "filter"
+msgstr "�หลม"
+
+#: ../app/widgets/gimptagentry.c:44
+#, fuzzy
+msgid "enter tags"
+msgstr "�ร��ลา�"
+
+#. Seperator for tags
+#. * IMPORTANT: use only one of Unicode terminal punctuation chars.
+#. * http://unicode.org/review/pr-23.html
+#.
+#: ../app/widgets/gimptagentry.c:1716
+msgid ","
+msgstr ""
 
-#: ../app/widgets/gimptemplateeditor.c:180
+#: ../app/widgets/gimptemplateeditor.c:179
 #, c-format
 msgid "%p"
 msgstr "%p"
 
-#: ../app/widgets/gimptemplateeditor.c:255
+#: ../app/widgets/gimptemplateeditor.c:254
 msgid "_Advanced Options"
 msgstr "�ัว�ลือ�_�ั��สู�"
 
-#: ../app/widgets/gimptemplateeditor.c:362
+#: ../app/widgets/gimptemplateeditor.c:361
 #, fuzzy
 msgid "Color _space:"
 msgstr "สม�ุลสี"
 
-#: ../app/widgets/gimptemplateeditor.c:370
+#: ../app/widgets/gimptemplateeditor.c:369
 msgid "_Fill with:"
 msgstr "�_�ิม��วย:"
 
-#: ../app/widgets/gimptemplateeditor.c:380
+#: ../app/widgets/gimptemplateeditor.c:379
 msgid "Comme_nt:"
 msgstr "หมาย�_ห�ุ:"
 
-#: ../app/widgets/gimptemplateeditor.c:528
+#: ../app/widgets/gimptemplateeditor.c:529
 msgid "_Name:"
 msgstr "_�ื�อ:"
 
-#: ../app/widgets/gimptemplateeditor.c:541
+#: ../app/widgets/gimptemplateeditor.c:542
 msgid "_Icon:"
 msgstr "�อ_�อ�:"
 
-#: ../app/widgets/gimptemplateeditor.c:668
+#: ../app/widgets/gimptemplateeditor.c:670
 #, fuzzy, c-format
 msgid "%d Ã? %d ppi, %s"
 msgstr "%d x %d dpi, %s"
 
-#: ../app/widgets/gimptemplateeditor.c:670
+#: ../app/widgets/gimptemplateeditor.c:672
 #, fuzzy, c-format
 msgid "%d ppi, %s"
 msgstr "%d dpi, %s"
 
+#: ../app/widgets/gimptextbuffer-serialize.c:338
+#, c-format
+msgid "Attribute \"%s\" is invalid on <%s> element in this context"
+msgstr ""
+
+#: ../app/widgets/gimptextbuffer-serialize.c:410
+#, c-format
+msgid "Outermost element in text must be <markup> not <%s>"
+msgstr ""
+
+#: ../app/widgets/gimptextbuffer.c:1319
+#, c-format
+msgid "Invalid UTF-8 data in file '%s'."
+msgstr "��อมูล��� UTF-8 ����ล� '%s' �ม��ู���อ�"
+
 #: ../app/widgets/gimptexteditor.c:205
 #, fuzzy
 msgid "_Use selected font"
 msgstr "��ิ�ลำ�ั��ี��ลือ�"
 
-#: ../app/widgets/gimpthumbbox.c:316
+#: ../app/widgets/gimptextstyleeditor.c:192
+#, fuzzy
+#| msgid "Change the size of the layer content"
+msgid "Change size of selected text"
+msgstr "��ลี�ย���า��ื���ี��อ��ั���า�"
+
+#: ../app/widgets/gimptextstyleeditor.c:211
+#, fuzzy
+#| msgid "Clear the selected pixels"
+msgid "Clear style of selected text"
+msgstr "ล�ล�า��ิ���ล�ั��หม��ี��ลือ�"
+
+#: ../app/widgets/gimptextstyleeditor.c:231
+msgid "Change kerning of selected text"
+msgstr ""
+
+#: ../app/widgets/gimptextstyleeditor.c:247
+#, fuzzy
+#| msgid "Change the size of the layer content"
+msgid "Change baseline of selected text"
+msgstr "��ลี�ย���า��ื���ี��อ��ั���า�"
+
+#: ../app/widgets/gimpthumbbox.c:343
 #, fuzzy, c-format
 msgid ""
 "Click to update preview\n"
@@ -11593,30 +16532,44 @@ msgstr ""
 "����ื�อ�ูภา��หม�อี��รั��\n"
 "%s  ����ื�อ�ั��ั��ห��ึ�ภา��หม�อี� �ึ��ะ����ภา�ล�าสุ��ล�ว���าม"
 
-#: ../app/widgets/gimpthumbbox.c:334
+#: ../app/widgets/gimpthumbbox.c:361
 #, fuzzy
 msgid "Pr_eview"
 msgstr "�ส���ัวอย�า�"
 
-#: ../app/widgets/gimpthumbbox.c:389 ../app/widgets/gimpthumbbox.c:464
+#: ../app/widgets/gimpthumbbox.c:416 ../app/widgets/gimpthumbbox.c:480
 msgid "No selection"
 msgstr "�ม�มี�าร�ลือ�"
 
-#: ../app/widgets/gimpthumbbox.c:592 ../app/widgets/gimpthumbbox.c:616
+#: ../app/widgets/gimpthumbbox.c:608 ../app/widgets/gimpthumbbox.c:629
 #, c-format
 msgid "Thumbnail %d of %d"
 msgstr "รู�ย�อ %d �อ� %d"
 
-#: ../app/widgets/gimpthumbbox.c:727 ../app/widgets/gimpthumbbox.c:737
+#: ../app/widgets/gimpthumbbox.c:742 ../app/widgets/gimpthumbbox.c:752
 #, fuzzy
 msgid "Creating preview..."
 msgstr "�ำลั�สร�า��ัวอย�า��าร�ส�� ..."
 
-#: ../app/widgets/gimptoolbox-color-area.c:135
+#: ../app/widgets/gimptoolbox-color-area.c:79
+#, fuzzy
+#| msgid ""
+#| "Foreground & background colors.  The black and white squares reset "
+#| "colors.  The arrows swap colors. Click to open the color selection dialog."
+msgid ""
+"Foreground & background colors.\n"
+"The black and white squares reset colors.\n"
+"The arrows swap colors.\n"
+"Click to open the color selection dialog."
+msgstr ""
+"สี�ื��ห��า�ละ�ื��หลั�  ��อ�สี��หลี�ยมสี�าว�ละ�ำ�ล��� ����ั����าสี�ลั������าว�ำ ลู�ศร�ล��� "
+"���สลั�สี�ื��ห��า-�ื��หลั� �ลิ��ี���อ�สี���ละอั���ื�อ�ลือ�สี�ี���อ��าร"
+
+#: ../app/widgets/gimptoolbox-color-area.c:140
 msgid "Change Foreground Color"
 msgstr "��ลี�ย�สี�ื��ห��า"
 
-#: ../app/widgets/gimptoolbox-color-area.c:140
+#: ../app/widgets/gimptoolbox-color-area.c:145
 msgid "Change Background Color"
 msgstr "��ลี�ย�สี�ื��หลั�"
 
@@ -11627,230 +16580,343 @@ msgid ""
 "Click to open the Image Dialog."
 msgstr ""
 "ภา��ี��ำ�า�อยู�\n"
-"����ื�อ��ิ�ห��า�อ�����ภา�"
+"����ื�อ��ิ��ล�อ�����อ������ภา�"
 
 #: ../app/widgets/gimptoolbox-image-area.c:114
 msgid "Drag to an XDS enabled file-manager to save the image."
 msgstr ""
 
-#: ../app/widgets/gimptoolbox-indicator-area.c:150
+#: ../app/widgets/gimptoolbox-indicator-area.c:149
 msgid ""
 "The active brush.\n"
 "Click to open the Brush Dialog."
 msgstr ""
-"หัว��ร��ี��ำ�า�อยู�\n"
-"����ื�อ��ิ��รอ��รั�����หัว��ร�"
+"หัว��ร��ี�����า�อยู�\n"
+"����ื�อ��ิ��ล�อ�����อ��รั�����หัว��ร�"
 
-#: ../app/widgets/gimptoolbox-indicator-area.c:182
+#: ../app/widgets/gimptoolbox-indicator-area.c:181
 msgid ""
 "The active pattern.\n"
 "Click to open the Pattern Dialog."
 msgstr ""
-"���ลาย�ี��ำ�า�อยู�\n"
-"����ื�อ��ิ��รอ��รั��������ลาย"
+"���ลาย�ี�����า�อยู�\n"
+"����ื�อ��ิ��ล�อ�����อ��รั��������ลาย"
 
-#: ../app/widgets/gimptoolbox-indicator-area.c:214
+#: ../app/widgets/gimptoolbox-indicator-area.c:213
 msgid ""
 "The active gradient.\n"
 "Click to open the Gradient Dialog."
 msgstr ""
-"สี�ร��า�ี��ำ�า�อยู�\n"
-"����ื�อ��ิ��รอ��รั�����สี�ร��า"
+"สี�ร��า�ี�����า�อยู�\n"
+"����ื�อ��ิ��ล�อ�����อ��รั�����สี�ร��า"
 
-#: ../app/widgets/gimptoolbox.c:697
-msgid ""
-"Foreground & background colors.  The black and white squares reset colors.  "
-"The arrows swap colors. Click to open the color selection dialog."
-msgstr ""
-"สี�ื��ห��า�ละ�ื��หลั�  ��อ�สี��หลี�ยมสี�าว�ละ�ำ�ล��� ����ั����าสี�ลั������าว�ำ ลู�ศร�ล��� "
-"���สลั�สี�ื��ห��า-�ื��หลั� �ลิ��ี���อ�สี���ละอั���ื�อ�ลือ�สี�ี���อ��าร"
+#: ../app/widgets/gimptooleditor.c:295
+#, fuzzy
+#| msgid "Raise tool"
+msgid "Raise this tool"
+msgstr "��รื�อ�มือสลั��ึ��"
+
+#: ../app/widgets/gimptooleditor.c:296
+#, fuzzy
+#| msgid "Raise tool to top"
+msgid "Raise this tool to the top"
+msgstr "สลั���รื�อ�มือ�ว���สุ�"
+
+#: ../app/widgets/gimptooleditor.c:303
+#, fuzzy
+#| msgid "Lower tool"
+msgid "Lower this tool"
+msgstr "��รื�อ�มือสลั�ล�"
+
+#: ../app/widgets/gimptooleditor.c:304
+#, fuzzy
+#| msgid "Lower tool to bottom"
+msgid "Lower this tool to the bottom"
+msgstr "สลั���รื�อ�มือ�ว�ล�า�สุ�"
+
+#: ../app/widgets/gimptooleditor.c:311
+msgid "Reset tool order and visibility"
+msgstr "�ื���าลำ�ั���รื�อ�มือ�ละ�ารมอ��ห��"
 
-#: ../app/widgets/gimptooloptionseditor.c:151
+#: ../app/widgets/gimptooloptionseditor.c:206
 msgid "Save options to..."
 msgstr "�ั��ึ��ัว�ลือ���ยั�..."
 
-#: ../app/widgets/gimptooloptionseditor.c:159
+#: ../app/widgets/gimptooloptionseditor.c:214
 msgid "Restore options from..."
 msgstr "�รีย��ื��ัว�ลือ��า�..."
 
-#: ../app/widgets/gimptooloptionseditor.c:167
+#: ../app/widgets/gimptooloptionseditor.c:222
 msgid "Delete saved options..."
 msgstr "ล��ัว�ลือ��ี�����ั��ึ�..."
 
-#: ../app/widgets/gimpuimanager.c:696
+#: ../app/widgets/gimptooloptionseditor.c:562
+#, fuzzy, c-format
+#| msgid "Error saving XCF file: %s"
+msgid "Error saving tool options presets: %s"
+msgstr "�ิ��ลา����าร�ั��ี����ม��� XCF: %s"
+
+#: ../app/widgets/gimptoolpreseteditor.c:109
+msgid "Apply stored FG/BG"
+msgstr ""
+
+#: ../app/widgets/gimptoolpreseteditor.c:115
+#, fuzzy
+#| msgid "Duplicate brush"
+msgid "Apply stored brush"
+msgstr "สำ��าหัว��ร�"
+
+#: ../app/widgets/gimptoolpreseteditor.c:121
+msgid "Apply stored dynamics"
+msgstr ""
+
+#: ../app/widgets/gimptoolpreseteditor.c:127
+#, fuzzy
+#| msgid "Duplicate gradient"
+msgid "Apply stored gradient"
+msgstr "สำ��าสี�ร��า"
+
+#: ../app/widgets/gimptoolpreseteditor.c:133
+#, fuzzy
+#| msgid "Duplicate pattern"
+msgid "Apply stored pattern"
+msgstr "สำ��า���ลาย"
+
+#: ../app/widgets/gimptoolpreseteditor.c:139
+#, fuzzy
+msgid "Apply stored pallete"
+msgstr "��ิ�ม���า���า�สี  %s"
+
+#: ../app/widgets/gimptoolpreseteditor.c:145
+msgid "Apply stored font"
+msgstr ""
+
+#: ../app/widgets/gimptranslationstore.c:105
+msgid "System Language"
+msgstr ""
+
+#: ../app/widgets/gimptranslationstore.c:107
+msgid "English"
+msgstr ""
+
+#: ../app/widgets/gimpuimanager.c:750
 msgid "Your GIMP installation is incomplete:"
 msgstr "�าร�ิ��ั�� GIMP �อ���า��ม�สม�ูร��"
 
-#: ../app/widgets/gimpuimanager.c:698
-msgid "Plase make sure the menu XML files are correctly installed."
+#: ../app/widgets/gimpuimanager.c:752
+#, fuzzy
+#| msgid "Plase make sure the menu XML files are correctly installed."
+msgid "Please make sure the menu XML files are correctly installed."
 msgstr "�รุ�า�รว�สอ�ว�าราย�าร���ม XML �ิ��ั��อย�า��ู���อ�"
 
-#: ../app/widgets/gimpuimanager.c:703
+#: ../app/widgets/gimpuimanager.c:758
 #, c-format
 msgid "There was an error parsing the menu definition from %s: %s"
 msgstr ""
 
-#: ../app/widgets/gimpundoeditor.c:267
+#: ../app/widgets/gimpundoeditor.c:270
 msgid "[ Base Image ]"
 msgstr "[ ภา��ื���า� ]"
 
-#: ../app/widgets/gimpvectorstreeview.c:110
+#: ../app/widgets/gimpvectorstreeview.c:116
 msgid "Reorder path"
 msgstr "�ั��รีย��ส���า��หม�"
 
-#: ../app/widgets/gimpvectorstreeview.c:253
-msgid "Empty Path"
-msgstr "�ส���า�ว�า�"
+#: ../app/widgets/gimpvectorstreeview.c:118
+#, fuzzy
+#| msgid "Connect Strokes"
+msgid "Lock path strokes"
+msgstr "��อ�ส��"
 
-#: ../app/widgets/gimpviewablebox.c:81
+#: ../app/widgets/gimpviewablebox.c:80
 msgid "Open the brush selection dialog"
-msgstr "��ิ��รอ��าร�ลือ�หัว��ร�"
+msgstr "��ิ��ล�อ�����อ��ลือ�หัว��ร�"
 
-#: ../app/widgets/gimpviewablebox.c:138
+#: ../app/widgets/gimpviewablebox.c:137
 msgid "Open the pattern selection dialog"
-msgstr "��ิ��รอ��าร�ลือ����ลาย"
+msgstr "��ิ��ล�อ�����อ��ลือ����ลาย"
 
-#: ../app/widgets/gimpviewablebox.c:204
+#: ../app/widgets/gimpviewablebox.c:203
 msgid "Open the gradient selection dialog"
-msgstr "��ิ��รอ��าร�ลือ�สี�ร��า"
-
-#: ../app/widgets/gimpviewablebox.c:219
-msgid "Reverse"
-msgstr "�ลิ�"
+msgstr "��ิ��ล�อ�����อ��ลือ�สี�ร��า"
 
-#: ../app/widgets/gimpviewablebox.c:298
+#: ../app/widgets/gimpviewablebox.c:305
 msgid "Open the palette selection dialog"
-msgstr "��ิ��รอ��าร�ลือ��า�สี"
+msgstr "��ิ��ล�อ�����อ��ลือ��า�สี"
 
-#: ../app/widgets/gimpviewablebox.c:356
+#: ../app/widgets/gimpviewablebox.c:363
 msgid "Open the font selection dialog"
-msgstr "��ิ��รอ��าร�ลือ����อั�ษร"
-
-#. do not translate the part before the |
-#: ../app/widgets/gimpwidgets-utils.c:548
-msgid "keyboard label|Space"
-msgstr ""
-
-#. do not translate the part before the |
-#: ../app/widgets/gimpwidgets-utils.c:552
-msgid "keyboard label|Backslash"
-msgstr ""
+msgstr "��ิ��ล�อ�����อ��ลือ����อั�ษร"
 
-#: ../app/widgets/gimpwidgets-utils.c:662
+#: ../app/widgets/gimpwidgets-utils.c:646
 #, c-format
 msgid "%s (try %s)"
-msgstr ""
+msgstr "%s (ลอ� %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:662
+#: ../app/widgets/gimpwidgets-utils.c:646
 #, c-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:666
+#: ../app/widgets/gimpwidgets-utils.c:650
 #, c-format
 msgid "%s (try %s, %s)"
-msgstr ""
+msgstr "%s (ลอ� %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:670
+#: ../app/widgets/gimpwidgets-utils.c:654
 #, c-format
 msgid "%s (try %s, %s, %s)"
-msgstr ""
-
-#: ../app/widgets/gimpwidgets-utils.c:954
-#, c-format
-msgid "Invalid UTF-8 data in file '%s'."
-msgstr "��อมูล��� UTF-8 ����ล� '%s' �ม��ู���อ�"
+msgstr "%s (ลอ� %s, %s, %s)"
 
 #: ../app/widgets/widgets-enums.c:23
+#, fuzzy
+#| msgid "Foreground"
+msgctxt "active-color"
 msgid "Foreground"
 msgstr "�ื��ห��า"
 
-#: ../app/widgets/widgets-enums.c:53
-msgid "Portrait"
-msgstr "��ว�ั��"
-
-#: ../app/widgets/widgets-enums.c:54
-msgid "Landscape"
-msgstr "��ว�อ�"
+#: ../app/widgets/widgets-enums.c:24
+#, fuzzy
+#| msgid "Background"
+msgctxt "active-color"
+msgid "Background"
+msgstr "�ื��หลั�"
 
-#: ../app/widgets/widgets-enums.c:113
+#: ../app/widgets/widgets-enums.c:85
 #, fuzzy
+msgctxt "color-frame-mode"
 msgid "Pixel"
 msgstr "�ุ�ภา�"
 
-#: ../app/widgets/widgets-enums.c:115
+#: ../app/widgets/widgets-enums.c:86
+#, fuzzy
+#| msgid "RGB"
+msgctxt "color-frame-mode"
+msgid "RGB"
+msgstr "RGB"
+
+#: ../app/widgets/widgets-enums.c:87
+#, fuzzy
+#| msgid "HSV"
+msgctxt "color-frame-mode"
 msgid "HSV"
 msgstr "HSV"
 
-#: ../app/widgets/widgets-enums.c:116
+#: ../app/widgets/widgets-enums.c:88
+#, fuzzy
+#| msgid "CMYK"
+msgctxt "color-frame-mode"
 msgid "CMYK"
 msgstr "CMYK"
 
-#: ../app/widgets/widgets-enums.c:171
-msgid "Black & white"
-msgstr "�าว�ำ"
+#: ../app/widgets/widgets-enums.c:118
+#, fuzzy
+#| msgid "Pick only"
+msgctxt "color-pick-mode"
+msgid "Pick only"
+msgstr "�������า�ั��"
 
-#: ../app/widgets/widgets-enums.c:172
-msgid "Fancy"
-msgstr ""
+#: ../app/widgets/widgets-enums.c:119
+#, fuzzy
+#| msgid "Set foreground color"
+msgctxt "color-pick-mode"
+msgid "Set foreground color"
+msgstr "��ลี�ย��ี�สี�ื��ห��า"
 
-#: ../app/widgets/widgets-enums.c:199
-msgid "GIMP help browser"
-msgstr "�ัว�รีย��ูราย�าร��วย�หลือ GIMP"
+#: ../app/widgets/widgets-enums.c:120
+#, fuzzy
+#| msgid "Set background color"
+msgctxt "color-pick-mode"
+msgid "Set background color"
+msgstr "��ลี�ย��ี�สี�ื��หลั�"
 
-#: ../app/widgets/widgets-enums.c:200
-msgid "Web browser"
-msgstr "�ัว�ู�ว��"
+#: ../app/widgets/widgets-enums.c:121
+#, fuzzy
+msgctxt "color-pick-mode"
+msgid "Add to palette"
+msgstr "��ิ�ม���า���า�สี  %s"
 
-#: ../app/widgets/widgets-enums.c:227
-msgid "Linear"
-msgstr "��ิ��ส��"
+#: ../app/widgets/widgets-enums.c:178
+#, fuzzy
+#| msgid "Histogram"
+msgctxt "histogram-scale"
+msgid "Linear histogram"
+msgstr "�รา�ส�ิ�ิ�วาม�ี�"
 
-#: ../app/widgets/widgets-enums.c:228
-msgid "Logarithmic"
+#: ../app/widgets/widgets-enums.c:179
+msgctxt "histogram-scale"
+msgid "Logarithmic histogram"
 msgstr ""
 
-#: ../app/widgets/widgets-enums.c:261
+#: ../app/widgets/widgets-enums.c:213
+#, fuzzy
+#| msgid "Icon"
+msgctxt "tab-style"
 msgid "Icon"
 msgstr "�อ�อ�"
 
-#: ../app/widgets/widgets-enums.c:262
+#: ../app/widgets/widgets-enums.c:214
+#, fuzzy
+#| msgid "Current status"
+msgctxt "tab-style"
 msgid "Current status"
 msgstr "ส�า�ะ�ั��ุ�ั�"
 
-#: ../app/widgets/widgets-enums.c:264
+#: ../app/widgets/widgets-enums.c:215
+#, fuzzy
+#| msgid "Text"
+msgctxt "tab-style"
+msgid "Text"
+msgstr "��อ�วาม"
+
+#: ../app/widgets/widgets-enums.c:216
+#, fuzzy
+#| msgid "Description"
+msgctxt "tab-style"
 msgid "Description"
 msgstr "�ำอ�ิ�าย"
 
-#: ../app/widgets/widgets-enums.c:265
+#: ../app/widgets/widgets-enums.c:217
+#, fuzzy
+#| msgid "Icon & text"
+msgctxt "tab-style"
 msgid "Icon & text"
 msgstr "�อ�อ��ละ���อ�วาม"
 
-#: ../app/widgets/widgets-enums.c:266
+#: ../app/widgets/widgets-enums.c:218
+#, fuzzy
+#| msgid "Icon & text"
+msgctxt "tab-style"
 msgid "Icon & desc"
-msgstr ""
+msgstr "�อ�อ��ละ���อ�วาม"
 
-#: ../app/widgets/widgets-enums.c:267
+#: ../app/widgets/widgets-enums.c:219
+#, fuzzy
+#| msgid "Status & text"
+msgctxt "tab-style"
 msgid "Status & text"
 msgstr "ส�า�ะ�ละ��อ�วาม"
 
-#: ../app/widgets/widgets-enums.c:268
+#: ../app/widgets/widgets-enums.c:220
+#, fuzzy
+#| msgid "Status & text"
+msgctxt "tab-style"
 msgid "Status & desc"
-msgstr ""
-
-#: ../app/widgets/widgets-enums.c:296
-msgid "Normal window"
-msgstr "ห��า��า����ิ"
+msgstr "ส�า�ะ�ละ��อ�วาม"
 
-#: ../app/widgets/widgets-enums.c:297
-msgid "Utility window"
+#: ../app/xcf/xcf-load.c:329
+msgid ""
+"This XCF file is corrupt!  I have loaded as much of it as I can, but it is "
+"incomplete."
 msgstr ""
 
-#: ../app/widgets/widgets-enums.c:298
-msgid "Keep above"
+#: ../app/xcf/xcf-load.c:340
+msgid ""
+"This XCF file is corrupt!  I could not even salvage any partial image data "
+"from it."
 msgstr ""
 
-#: ../app/xcf/xcf-load.c:320
+#: ../app/xcf/xcf-load.c:404
 msgid ""
 "XCF warning: version 0 of XCF file format\n"
 "did not save indexed colormaps correctly.\n"
@@ -11860,46 +16926,54 @@ msgstr ""
 "�ม�สามาร��ั��ึ��ั��ี�ั�สี���อย�า��ู���อ�\n"
 "����ั������า���"
 
-#: ../app/xcf/xcf-read.c:107
+#: ../app/xcf/xcf-read.c:108
 msgid "Invalid UTF-8 string in XCF file"
 msgstr "��อ�วาม��� UTF-8 �����ม XCF �ม��ู���อ�"
 
-#: ../app/xcf/xcf-save.c:162 ../app/xcf/xcf-save.c:173
-#: ../app/xcf/xcf-save.c:184 ../app/xcf/xcf-save.c:195
-#: ../app/xcf/xcf-save.c:220 ../app/xcf/xcf.c:386
-#, c-format
-msgid "Error saving XCF file: %s"
-msgstr "�ิ��ลา����าร�ั��ี����ม��� XCF: %s"
-
-#: ../app/xcf/xcf-write.c:87
+#: ../app/xcf/xcf-write.c:86
 #, c-format
 msgid "Error writing XCF: %s"
 msgstr "�ิ��ลา����าร��ีย����� XCF: %s"
 
-#: ../app/xcf/xcf-seek.c:44 ../app/xcf/xcf-seek.c:61 ../app/xcf/xcf-seek.c:72
+#: ../app/xcf/xcf-seek.c:43 ../app/xcf/xcf-seek.c:60 ../app/xcf/xcf-seek.c:71
 #, c-format
 msgid "Could not seek in XCF file: %s"
 msgstr "�ม�สามาร����หา�����ม��� XCF: %s"
 
-#: ../app/xcf/xcf.c:96 ../app/xcf/xcf.c:162
+#: ../app/xcf/xcf.c:98 ../app/xcf/xcf.c:166
 msgid "GIMP XCF image"
 msgstr "ภา� GIMP XCF"
 
-#: ../app/xcf/xcf.c:263
+#: ../app/xcf/xcf.c:270
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "�าร��ิ� '%s' ล�ม�หลว:%s"
 
-#: ../app/xcf/xcf.c:305
+#: ../app/xcf/xcf.c:312
 #, c-format
 msgid "XCF error: unsupported XCF file version %d encountered"
 msgstr ""
 
-#: ../app/xcf/xcf.c:371
+#: ../app/xcf/xcf.c:382
 #, fuzzy, c-format
 msgid "Saving '%s'"
 msgstr "�ำลั��ั��ึ� '%s'\n"
 
+#: ../app/xcf/xcf.c:402
+#, c-format
+msgid "Error saving XCF file: %s"
+msgstr "�ิ��ลา����าร�ั��ี����ม��� XCF: %s"
+
+#: ../data/tags/gimp-tags-default.xml.in.h:1
+msgid "fuzzy"
+msgstr ""
+
+#: ../data/tags/gimp-tags-default.xml.in.h:2
+#, fuzzy
+#| msgid "Round"
+msgid "round"
+msgstr "ม�"
+
 #: ../desktop/gimp.desktop.in.in.h:1
 #, fuzzy
 msgid "Create images and edit photographs"
@@ -11907,50 +16981,510 @@ msgstr "สร�า��ละ������ภา�หรือรู�
 
 #: ../desktop/gimp.desktop.in.in.h:3
 msgid "Image Editor"
-msgstr "�ัว�����ภา�"
+msgstr "��รื�อ�มือ�����ภา�"
 
-#: ../tools/gimp-remote.c:84
+#: ../tools/gimp-remote.c:64
 msgid "Use a running GIMP only, never start a new one"
 msgstr ""
 
-#: ../tools/gimp-remote.c:89
+#: ../tools/gimp-remote.c:69
 msgid "Only check if GIMP is running, then quit"
 msgstr ""
 
-#: ../tools/gimp-remote.c:94
+#: ../tools/gimp-remote.c:75
 msgid "Print X window ID of GIMP toolbox window, then quit"
 msgstr ""
 
-#: ../tools/gimp-remote.c:99
+#: ../tools/gimp-remote.c:81
 msgid "Start GIMP without showing the startup window"
 msgstr ""
 
-#: ../tools/gimp-remote.c:203
+#: ../tools/gimp-remote-x11.c:66
 msgid "Could not connect to GIMP."
 msgstr ""
 
-#: ../tools/gimp-remote.c:204
+#: ../tools/gimp-remote-x11.c:67
 msgid "Make sure that the Toolbox is visible!"
 msgstr ""
 
 #. if execv and execvp return, there was an error
-#: ../tools/gimp-remote.c:305
+#: ../tools/gimp-remote-x11.c:247
 #, fuzzy, c-format
 msgid "Couldn't start '%s': %s"
 msgstr "�ม�สามาร�สร�า� '%s': %s ���"
 
-#, fuzzy
-#~ msgid "Ma_p"
-#~ msgstr "�_���ั�"
+#~ msgid "Reset Tool Options"
+#~ msgstr "�ลั���า��ิม�ัว�ลือ���รื�อ�มือ"
 
-#~ msgid "Cr_op Layer"
+#~ msgid "(This console window will close in ten seconds)\n"
+#~ msgstr "(ห��า��า��อ���ล�ี��ะ�ิ�ภาย��สิ�วิ�า�ี)\n"
+
+#~ msgid "Colormap Editor"
+#~ msgstr "��รื�อ�มือ������ั�สี"
+
+#~ msgid "New brush"
+#~ msgstr "หัว��ร��หม�"
+
+#~ msgid "_Aspect"
+#~ msgstr "_สั�ส�ว�"
+
+#~ msgid "Sample Merged"
+#~ msgstr "ภา�รวม"
+
+#~ msgid "_Dialogs"
+#~ msgstr "_�ล�อ�����อ�"
+
+#~ msgid "Create New Doc_k"
+#~ msgstr "สร�า�สำ_รั��า��หม�"
+
+#~ msgid "_Layers, Channels & Paths"
+#~ msgstr "_�ั���า�, �����ล �ละ �ส���า�"
+
+#~ msgid "_Brushes, Patterns & Gradients"
+#~ msgstr "หั_ว��ร�, ���ลาย �ละ สี�ร��า"
+
+#~ msgid "_Misc. Stuff"
+#~ msgstr "_�ิ�า�ะ"
+
+#~ msgid "T_ools"
+#~ msgstr "�_�รื�อ�มือ"
+
+#~ msgid "Remove dangling entries"
+#~ msgstr "ล�ราย�าร�ี��ม�มีอยู��ริ�ออ�"
+
+#~ msgid "Remove all entries from the document history?"
+#~ msgstr "ล��ุ�ลำ�ั�ราย�ารออ��า�ราย�าร�ระวั�ิ�อ�สารหรือ�ม�?"
+
+#~ msgid "Paste as New"
+#~ msgstr "��ะ����ภา��_หม�"
+
+#~ msgid "Fill with P_attern"
+#~ msgstr "��ิม��วย�_��ลาย"
+
+#~ msgid "Save error log"
+#~ msgstr "�ั��ึ��ูม��อ�ิ��ลา�"
+
+#~ msgid "Save selection"
+#~ msgstr "�ั��ึ����าะส�ว��ี��ลือ��ลือ�"
+
+#~ msgid "Acq_uire"
+#~ msgstr "_รั����ามา"
+
+#~ msgid "Save as _Template..."
+#~ msgstr "�ั��ึ������_ม����..."
+
+#~ msgid "Rescan font list"
+#~ msgstr "�รว�หาราย�าร���อั�ษร�หม�อี��รั��"
+
+#~ msgid "New gradient"
+#~ msgstr "สี�ร��า�หม�"
+
+#~ msgid "Toolbox Menu"
+#~ msgstr "ราย�าร�ล�อ���รื�อ�มือ"
+
+#~ msgid "_Xtns"
+#~ msgstr "_Xtns"
+
+#, fuzzy
+#~ msgid "_Crop Layer"
 #~ msgstr "�ั��รอ��ั���า�"
 
-#~ msgid "_All"
-#~ msgstr "_�ั��หม�"
+#~ msgid "Set Opacity"
+#~ msgstr "�ั����า�วาม�ึ��ส�"
+
+#~ msgid "Invalid width or height. Both must be positive."
+#~ msgstr "��า�วาม�ว�า�หรือ�วามสู��ม��ู���อ� �วรมี��า�����ว�"
+
+#~ msgid "Delete color"
+#~ msgstr "ล�สี"
+
+#~ msgid "New palette"
+#~ msgstr "�า�สี�หม�"
+
+#~ msgid "New pattern"
+#~ msgstr "���ลาย�หม�"
+
+#, fuzzy
+#~ msgid "select|_All"
+#~ msgstr "�ลือ�_�ั��หม�"
+
+#, fuzzy
+#~ msgid "select|_None"
+#~ msgstr "�ม�มี�าร�ลือ�"
+
+#~ msgid "Edit the selected template"
+#~ msgstr "�������า��า��ม�����ี��ลือ�"
+
+#~ msgid "R_aise Tool"
+#~ msgstr "��รื�อ�มือสลั�_�ึ��"
+
+#~ msgid "Ra_ise to Top"
+#~ msgstr "สลั�_��สุ�"
+
+#~ msgid "L_ower Tool"
+#~ msgstr "��รื�อ�มือสลั�_ล�"
+
+#~ msgid "Lo_wer to Bottom"
+#~ msgstr "สลั�ล�_ล�า�สุ�"
+
+#, fuzzy
+#~ msgid "_Reset Order & Visibility"
+#~ msgstr "�ริ�ม��าลำ�ั��ละ�ารมอ��ห��"
+
+#~ msgid "_Show in Toolbox"
+#~ msgstr "�ส_�����ล�อ���รื�อ�มือ"
+
+#~ msgid "New path..."
+#~ msgstr "�ส���า��หม�..."
+
+#~ msgid "_New Path"
+#~ msgstr "�ส���า��_หม�"
+
+#~ msgid "Stroke path..."
+#~ msgstr "�ี�ส���า��ส���า�..."
+
+#~ msgid "Add"
+#~ msgstr "��ิ�ม"
+
+#~ msgid "Intersect"
+#~ msgstr "��ำ�ั�"
+
+#, fuzzy
+#~ msgid "Fit Image _to Window"
+#~ msgstr "ภา����มห��า��า�"
+
+#, fuzzy
+#~ msgid "Parsing '%s'\n"
+#~ msgstr "�ำลั��ั��ำ '%s'\n"
+
+#~ msgid "Saving '%s'\n"
+#~ msgstr "�ำลั��ั��ึ� '%s'\n"
+
+#, fuzzy
+#~ msgid "When enabled, GIMP will show mnemonics in menus."
+#~ msgstr "�มื�อ��ิ�����า� GIMP "
+
+#, fuzzy
+#~ msgid "Enable displaying a handy GIMP tip on startup."
+#~ msgstr "��ิ������ื�อ�ส����อมูล�าร��� GIMP �มื�อมี�าร�ริ�ม��ร��รม"
+
+#~ msgid ""
+#~ "Sets the size of the thumbnail shown in the Open dialog. Note that GIMP "
+#~ "can not create thumbnails if layer previews are disabled."
+#~ msgstr ""
+#~ "�ำห����า��อ�รู�ย�อ�ี��ส����ห��า��า��าร��ิ���ล� ��� GIMP �ม�สามาร�สร�า�รู�ย�อ��� "
+#~ "��า�ม���ิ�����า�ส�ว��าร�ส���ั���า�"
+
+#, fuzzy
+#~ msgid ""
+#~ "Sets the external web browser to be used.  This can be an absolute path "
+#~ "or the name of an executable to search for in the user's PATH. If the "
+#~ "command contains '%s' it will be replaced with the URL, else the URL will "
+#~ "be appended to the command with a space separating the two."
+#~ msgstr ""
+#~ "�ำห���าร�ำ�ัว�รีย��ู�ว������มา��� "
+#~ "�ึ��อา��ะ�อ������ำ�ห���������ม�อ���ร��รมหรือ�ื�อ�อ����ม�ัว��ร��รม����� หา����ำสั��มี %s "
+#~ "���ะ�ู������วย URL "
+
+#~ msgid "Remove floating selection"
+#~ msgstr "�อา�ื���ี��ลือ�ลอย�ัวออ�"
+
+#, fuzzy
+#~ msgid "Reposition layer"
+#~ msgstr "�ั��ำ�ห����ั���า��หม�"
+
+#, fuzzy
+#~ msgid "Reposition channel"
+#~ msgstr "�ั��ำ�ห��������ล�หม�"
+
+#, fuzzy
+#~ msgid "Reposition path"
+#~ msgstr "��ล��ี���ี��ลือ������ส���า�"
+
+#, fuzzy
+#~ msgid "command|Rectangle Select"
+#~ msgstr "สี��หลี�ยมมุม�า�"
+
+#, fuzzy
+#~ msgid "command|Ellipse Select"
+#~ msgstr "ว�รี"
+
+#, fuzzy
+#~ msgid "command|Fuzzy Select"
+#~ msgstr "�ลือ�สุ�มสี"
+
+#, fuzzy
+#~ msgid "command|Select by Color"
+#~ msgstr "�ลือ��า�สี"
+
+#, fuzzy
+#~ msgid "command|Bucket Fill"
+#~ msgstr "��สี"
+
+#, fuzzy
+#~ msgid "command|Rotate"
+#~ msgstr "หมุ�"
+
+#, fuzzy
+#~ msgid "command|Crop Image"
+#~ msgstr "�ั��รอ��า�"
+
+#~ msgid "Channel is already on top."
+#~ msgstr "�����ลอยู���สุ��ล�ว"
+
+#~ msgid "Channel is already on the bottom."
+#~ msgstr "�����ลออยู�ล�า�สุ��ล�ว"
+
+#~ msgid "Path is already on top."
+#~ msgstr "�ส���า�อยู���สุ��ล�ว"
+
+#~ msgid "Path is already on the bottom."
+#~ msgstr "�ส���า�อยู���สุ��ล�ว"
+
+#~ msgid "Cannot add layer mask to layer which is not part of an image."
+#~ msgstr "�ม�สามาร���ิ�มห��า�า����า���ั���า���� �ึ���ม����ส�ว�ห�ึ���อ�ภา�"
+
+#~ msgid "Cannot add layer mask to a layer with no alpha channel."
+#~ msgstr "�ม�สามาร���ิ�ม�ั���า�ห��า�า�ล����ั���า������ย�ม�มี�����ลอัล�า"
+
+#~ msgid "Reading palette '%s': Missing GREEN component in line %d."
+#~ msgstr "�ารอ�า���ล��า�สี '%s': ��าสี��ียว�ิ��ลา��ี��รร�ั� %d"
+
+#, fuzzy
+#~ msgid "plural|percent"
+#~ msgstr "��อร�������"
+
+#, fuzzy
+#~ msgid "dialog-title|Scale Image"
+#~ msgstr "�รั�สั�ส�ว�ภา�"
+
+#, fuzzy
+#~ msgid "Manage Loadable Modules"
+#~ msgstr "�ั��าร"
+
+#~ msgid "Autoload"
+#~ msgstr "�หล�อั���มั�ิ"
+
+#, fuzzy
+#~ msgid "Module Path"
+#~ msgstr "�ลื�อ��ส���า�"
+
+#, fuzzy
+#~ msgid "On disk"
+#~ msgstr "�ม�มี�����ั��ึ���อมูล"
+
+#~ msgid "Load"
+#~ msgstr "�หล�"
+
+#, fuzzy
+#~ msgid "Unload"
+#~ msgstr "�ม��หล�"
+
+#, fuzzy
+#~ msgid "Purpose:"
+#~ msgstr "�ุ��ระส���:"
+
+#, fuzzy
+#~ msgid "Last error:"
+#~ msgstr "ล���อ�ิ��ลา���า��"
+
+#, fuzzy
+#~ msgid "Available types:"
+#~ msgstr "�ิล��อร��ี�������"
+
+#~ msgid "Save document _history on exit"
+#~ msgstr "�ั��ึ�ราย�าร�ระวั�ิ�ิ���า��มื�อออ��า���ร��รม"
+
+#~ msgid "_Web browser to use:"
+#~ msgstr "�_ว����ราว���อร��ี��ะ���:"
+
+#~ msgid "Show tip next time GIMP starts"
+#~ msgstr "�ส���ำ��ะ�ำ�าร��� GIMP �มื�อ��ิ���ร��รม�รั����อ��"
+
+#, fuzzy
+#~ msgid "Do_n't Save"
+#~ msgstr "�_ม��ั��ึ�"
+
+#, fuzzy
+#~ msgid "minute"
+#~ msgid_plural "%d minutes"
+#~ msgstr[0] "�า�ี"
+#~ msgstr[1] "�า�ี"
+
+#~ msgid "RGB-empty"
+#~ msgstr "RGB-ว�า�"
+
+#~ msgid "grayscale-empty"
+#~ msgstr "grayscale-ว�า�"
+
+#~ msgid "grayscale"
+#~ msgstr "grayscale"
 
-#~ msgid "_None"
-#~ msgstr "�_ม�มี"
+#~ msgid "indexed-empty"
+#~ msgstr "indexed-ว�า�"
+
+#~ msgid "indexed"
+#~ msgstr "indexed"
+
+#~ msgid "Shadow type"
+#~ msgstr "�ระ�ภ���า"
+
+#~ msgid "Style of bevel around the statusbar text"
+#~ msgstr "รู�����ารย��อ�รอ�� ���ส�า�ะ��อ�วาม"
+
+#, fuzzy
+#~ msgid "Other..."
+#~ msgstr "_อื���"
+
+#~ msgid "Writing '%s'\n"
+#~ msgstr "�ำลั���ีย� '%s'\n"
+
+#~ msgid "Adding theme '%s' (%s)\n"
+#~ msgstr "�ำลั���ิ�ม�ุ������� '%s' (%s)\n"
+
+#~ msgid "Left justified"
+#~ msgstr "�ิ���าย"
+
+#~ msgid "Right justified"
+#~ msgstr "�ิ��วา"
+
+#~ msgid "Centered"
+#~ msgstr "�ร��ลา�"
+
+#~ msgid "Filled"
+#~ msgstr "���ม"
+
+#~ msgid "(invalid UTF-8 string)"
+#~ msgstr "(��อ�วาม��� UTF-8 ����ม����)"
+
+#, fuzzy
+#~ msgid "command|Foreground Select"
+#~ msgstr "�ื��ห��า"
+
+#, fuzzy
+#~ msgid "command|Free Select"
+#~ msgstr "�ลือ�อิสระ"
+
+#~ msgid "Quick Load"
+#~ msgstr "�หล�อย�า��ร�ว"
+
+#~ msgid "Quick Save"
+#~ msgstr "�ั��ึ�อย�า��ร�ว"
+
+#, fuzzy
+#~ msgid "tool|_Zoom"
+#~ msgstr "_ย�อ�ยาย"
+
+#, fuzzy
+#~ msgid "tool|Move"
+#~ msgstr "�ลื�อ�"
+
+#~ msgid "Pressure sensitivity"
+#~ msgstr "�วาม�ว��อ�ร���"
+
+#, fuzzy
+#~ msgid "Aspect"
+#~ msgstr "สั�ส�ว�:"
+
+#~ msgid "Rotation Information"
+#~ msgstr "�ารหมุ���อมูล"
+
+#, fuzzy
+#~ msgid "Scaling Information"
+#~ msgstr "�าร�รั���า���อมูล"
+
+#~ msgid "Shearing Information"
+#~ msgstr "��อมูล�าร�ยื�อ�ภา�"
+
+#~ msgid "Transform Direction"
+#~ msgstr "�ำ�ั��าร��ล�ลั�ษ�ะภา�"
+
+#, fuzzy
+#~ msgid "Create Selection from Path"
+#~ msgstr "สร�า��ื���ี��ลือ��า��ส���า�"
+
+#, fuzzy
+#~ msgid "Image bounds"
+#~ msgstr "ห��า��า�ภา�"
+
+#, fuzzy
+#~ msgid "Drawable bounds"
+#~ msgstr "สามาร�วา����"
+
+#~ msgid "Transform layer"
+#~ msgstr "��ล�ลั�ษ�ะ�อ��ั���า�"
+
+#~ msgid "Transform selection"
+#~ msgstr "��ล�ลั�ษ�ะ�ื���ี��ลือ�"
+
+#~ msgid "Transform path"
+#~ msgstr "��ล�ลั�ษ�ะ�ส���า�"
+
+#~ msgid "Type a new accelerator, or press Backspace to clear"
+#~ msgstr "���ีย���ว��หม� หรือ�� Backspace ��ื�อล�ออ�"
+
+#~ msgid "Type a new accelerator"
+#~ msgstr "�ิม���ีย���ว�อั��หม�"
+
+#~ msgid "Empty Channel"
+#~ msgstr "�����ล��ล�า"
+
+#, fuzzy
+#~ msgid "Configure Controller"
+#~ msgstr "�รั����ห��า��า��ัว�รอ�สี"
+
+#, fuzzy
+#~ msgid "Close all Tabs?"
+#~ msgstr "�ิ��ุ�สำรั��า�"
+
+#~ msgid "Close all Tabs"
+#~ msgstr "�ิ��ุ�สำรั��า�"
+
+#~ msgid "Close all tabs?"
+#~ msgstr "�ิ��ุ�สำรั��า�หรือ�ม�?"
+
+#, fuzzy
+#~ msgid ""
+#~ "This window has %d tab open. Closing the window will also close all its "
+#~ "tabs."
+#~ msgid_plural ""
+#~ "This window has %d tabs open. Closing the window will also close all its "
+#~ "tabs."
+#~ msgstr[0] "ห��า��า��ี�มีสำรั� %d สำรั���ิ�อยู� หา��ิ�ห��า��า�สำรั��า�อื���ะ�ิ���วย"
+#~ msgstr[1] "ห��า��า��ี�มีสำรั� %d สำรั���ิ�อยู� หา��ิ�ห��า��า�สำรั��า�อื���ะ�ิ���วย"
+
+#~ msgid "You can drop dockable dialogs here."
+#~ msgstr "��า�สามาร�วา��ล�อ�����อ��ี�สามาร�วา���ื�อม����ี��ี�"
+
+#~ msgid "(%0.3f, %0.3f, %0.3f)"
+#~ msgstr "(%0.3f, %0.3f, %0.3f)"
+
+#~ msgid "Could not find GIMP help browser."
+#~ msgstr "�ม�สามาร�หา�ัว�รีย��ู�าร��วย�หลือ�อ� GIMP ���"
+
+#~ msgid "Use _web browser instead"
+#~ msgstr "����ัว�ู�_ว�����"
+
+#~ msgid "Pixel dimensions:"
+#~ msgstr "�ำ�ว��ุ�ภา�:"
+
+#~ msgid "Empty Layer"
+#~ msgstr "�ั���า�ว�า�"
+
+#~ msgid "Empty Path"
+#~ msgstr "�ส���า�ว�า�"
+
+#~ msgid "Portrait"
+#~ msgstr "��ว�ั��"
+
+#~ msgid "Landscape"
+#~ msgstr "��ว�อ�"
+
+#~ msgid "Linear"
+#~ msgstr "��ิ��ส��"
+
+#~ msgid "Cr_op Layer"
+#~ msgstr "�ั��รอ��ั���า�"
 
 #~ msgid "Solid"
 #~ msgstr "สี��ียว"
@@ -11965,9 +17499,6 @@ msgstr "�ม�สามาร�สร�า� '%s': %s ���"
 #~ msgid "Blend: Invalid for indexed images."
 #~ msgstr "�ลื�สี: ����ม������ภา���� Indexed"
 
-#~ msgid "Select regions by color"
-#~ msgstr "�ลือ��ื���ี��ามสี"
-
 #~ msgid "Paint using Patterns or Image Regions"
 #~ msgstr "�าสี��ย������ลายหรือ�ื���ี�อื����ภา�"