[gimp] l10n: Update Japanese translation



commit 654b3145ef8bb79a94805d1b66014d361339104d
Author: SimaMoto,RyōTa <rsimamoto src gnome org>
Date:   Sat Nov 16 18:18:55 2013 +0900

    l10n: Update Japanese translation

 po/ja.po | 7017 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 4320 insertions(+), 2697 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 8eec0d8..23f4c37 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-06 03:28+0200\n"
-"PO-Revision-Date: 2012-08-12 11:55+0900\n"
+"POT-Creation-Date: 2013-11-16 17:57+0900\n"
+"PO-Revision-Date: 2012-08-11 11:55+0900\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa gnome org>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "Language: ja\n"
@@ -79,27 +79,14 @@ msgstr ""
 "\n"
 "http://www.gnu.org/licenses/";
 
-#: ../app/app.c:224
-#, c-format
-msgid ""
-"Unable to open a test swap file.\n"
-"\n"
-"To avoid data loss, please check the location and permissions of the swap "
-"directory defined in your Preferences (currently \"%s\")."
-msgstr ""
-"テストスワップファイルを開けません。\n"
-"\n"
-"現在設定されているスワップ用フォルダーの場所 (\"%s\") とパーミッションが正し"
-"いか確認して、データ消失を防いでください。"
-
-#: ../app/batch.c:77
+#: ../app/batch.c:76
 #, c-format
 msgid "No batch interpreter specified, using the default '%s'.\n"
 msgstr ""
 "バッチインタープリターが指定されていません。既定のバッチインタープリター "
 "'%s' を使用します。\n"
 
-#: ../app/batch.c:95 ../app/batch.c:113
+#: ../app/batch.c:94 ../app/batch.c:112
 #, c-format
 msgid "The batch interpreter '%s' is not available. Batch mode disabled."
 msgstr "バッチインタープリター '%s' を利用できません。バッチモードは無効です。"
@@ -228,7 +215,7 @@ msgstr "(何かキーを押すとこのウィンドウを閉じます)\n"
 msgid "GIMP output. You can minimize this window, but don't close it."
 msgstr "GIMP:  このウィンドウを閉じないでください。(最小化はかまいません。)"
 
-#: ../app/sanity.c:433
+#: ../app/sanity.c:572
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
@@ -240,7 +227,7 @@ msgstr ""
 "\n"
 "環境変数 'G_FILENAME_ENCODING' の値を確認してください"
 
-#: ../app/sanity.c:452
+#: ../app/sanity.c:591
 #, c-format
 msgid ""
 "The name of the directory holding the GIMP user configuration cannot be "
@@ -268,220 +255,218 @@ msgstr "%s ver.%s を使用 (ver.%s 上でコンパイル)"
 msgid "%s version %s"
 msgstr "%s ver.%s"
 
-#: ../app/actions/actions.c:110 ../app/dialogs/dialogs.c:390
+#: ../app/actions/actions.c:109 ../app/dialogs/dialogs.c:391
 #: ../app/widgets/gimpbrusheditor.c:89
 msgid "Brush Editor"
 msgstr "ブラシエディター"
 
 #. initialize the list of gimp brushes
-#: ../app/actions/actions.c:113 ../app/core/gimp.c:951
-#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2740
+#: ../app/actions/actions.c:112 ../app/core/gimp.c:964
+#: ../app/dialogs/dialogs.c:320 ../app/dialogs/preferences-dialog.c:2573
 msgid "Brushes"
 msgstr "ブラシ"
 
-#: ../app/actions/actions.c:116 ../app/dialogs/dialogs.c:329
+#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:330
 msgid "Buffers"
 msgstr "バッファー"
 
-#: ../app/actions/actions.c:119 ../app/dialogs/dialogs.c:348
+#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:349
 msgid "Channels"
 msgstr "チャンネル"
 
-#: ../app/actions/actions.c:122 ../app/dialogs/convert-dialog.c:174
-#: ../app/dialogs/dialogs.c:356
+#: ../app/actions/actions.c:121 ../app/dialogs/convert-type-dialog.c:177
+#: ../app/dialogs/dialogs.c:357
 msgid "Colormap"
 msgstr "カラーマップ"
 
-#: ../app/actions/actions.c:125
-msgid "Configuration"
-msgstr "設定"
-
 # 子アイテムは、ツール/コマンドの操作に関するものなので、「状況」から「作業」に変更した
-#: ../app/actions/actions.c:128
+#: ../app/actions/actions.c:124
 msgid "Context"
 msgstr "作業"
 
 # 直訳は「ポインター情報」だが、機能内容はポインターが指しているピクセルに関する情報の表示なので、機能を直接的に表す「ピクセル情報」とした
-#: ../app/actions/actions.c:131 ../app/dialogs/dialogs.c:312
+#: ../app/actions/actions.c:127 ../app/dialogs/dialogs.c:313
 msgid "Pointer Information"
 msgstr "ピクセル情報"
 
-#: ../app/actions/actions.c:134
+#: ../app/actions/actions.c:130
 msgid "Debug"
 msgstr "デバッグ"
 
-#: ../app/actions/actions.c:137
+#: ../app/actions/actions.c:133
 msgid "Dialogs"
 msgstr "ダイアログ"
 
-#: ../app/actions/actions.c:140
+#: ../app/actions/actions.c:136
 msgid "Dock"
 msgstr "ドック"
 
-#: ../app/actions/actions.c:143
+#: ../app/actions/actions.c:139
 msgid "Dockable"
 msgstr "ドッキング可能"
 
 #. Document History
-#: ../app/actions/actions.c:146 ../app/dialogs/dialogs.c:331
-#: ../app/dialogs/preferences-dialog.c:1574
+#: ../app/actions/actions.c:142 ../app/dialogs/dialogs.c:332
+#: ../app/dialogs/preferences-dialog.c:1404
 msgid "Document History"
 msgstr "最近開いたファイル"
 
-#: ../app/actions/actions.c:149
+#: ../app/actions/actions.c:145
 msgid "Drawable"
 msgstr "描画対象"
 
 #. Some things do not have grids, so just list
-#: ../app/actions/actions.c:152 ../app/dialogs/dialogs.c:337
+#: ../app/actions/actions.c:148 ../app/dialogs/dialogs.c:338
 msgid "Paint Dynamics"
 msgstr "描画の動的特性"
 
-#: ../app/actions/actions.c:155 ../app/dialogs/dialogs.c:394
+#: ../app/actions/actions.c:151 ../app/dialogs/dialogs.c:395
 #: ../app/widgets/gimpdynamicseditor.c:93
 msgid "Paint Dynamics Editor"
 msgstr "動的特性エディター"
 
-#: ../app/actions/actions.c:158
+#: ../app/actions/actions.c:154
 msgid "Edit"
 msgstr "編集"
 
-#: ../app/actions/actions.c:161 ../app/dialogs/dialogs.c:308
+#: ../app/actions/actions.c:157 ../app/dialogs/dialogs.c:309
 msgid "Error Console"
 msgstr "エラーコンソール"
 
-#: ../app/actions/actions.c:164
+#: ../app/actions/actions.c:160
 msgid "File"
 msgstr "ファイル"
 
-#: ../app/actions/actions.c:167
+#: ../app/actions/actions.c:163
 #, fuzzy
+#| msgctxt "plug-in-action"
+#| msgid "Filte_rs"
 msgid "Filters"
 msgstr "フィルター(_R)"
 
-#: ../app/actions/actions.c:170 ../app/dialogs/dialogs.c:327
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:328
+#: ../app/dialogs/preferences-dialog.c:2593
 msgid "Fonts"
 msgstr "フォント"
 
-#: ../app/actions/actions.c:173 ../app/dialogs/dialogs.c:398
+#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:399
 #: ../app/widgets/gimpgradienteditor.c:270
 msgid "Gradient Editor"
 msgstr "グラデーションエディター"
 
 #. initialize the list of gimp gradients
-#: ../app/actions/actions.c:176 ../app/core/gimp.c:971
-#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2756
+#: ../app/actions/actions.c:172 ../app/core/gimp.c:984
+#: ../app/dialogs/dialogs.c:324 ../app/dialogs/preferences-dialog.c:2589
 msgid "Gradients"
 msgstr "グラデーション"
 
-#: ../app/actions/actions.c:179 ../app/core/gimp.c:983
-#: ../app/dialogs/dialogs.c:339 ../app/dialogs/preferences-dialog.c:2764
+#: ../app/actions/actions.c:175 ../app/core/gimp.c:996
+#: ../app/dialogs/dialogs.c:340 ../app/dialogs/preferences-dialog.c:2597
 msgid "Tool Presets"
 msgstr "ツールプリセット"
 
-#: ../app/actions/actions.c:182 ../app/dialogs/dialogs.c:406
+#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:407
 #: ../app/widgets/gimptoolpreseteditor.c:93
 msgid "Tool Preset Editor"
 msgstr "ツールプリセットエディター"
 
-#: ../app/actions/actions.c:185
+#: ../app/actions/actions.c:181
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../app/actions/actions.c:188
+#: ../app/actions/actions.c:184
 msgid "Image"
 msgstr "画像"
 
 #. list & grid views
-#: ../app/actions/actions.c:191 ../app/dialogs/dialogs.c:317
+#: ../app/actions/actions.c:187 ../app/dialogs/dialogs.c:318
 msgid "Images"
 msgstr "画像"
 
-#: ../app/actions/actions.c:194 ../app/dialogs/dialogs.c:344
-#: ../app/dialogs/resize-dialog.c:287
+#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:345
+#: ../app/dialogs/resize-dialog.c:289
 msgid "Layers"
 msgstr "レイヤー"
 
-#: ../app/actions/actions.c:197 ../app/dialogs/dialogs.c:402
+#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:403
 #: ../app/widgets/gimppaletteeditor.c:144
 msgid "Palette Editor"
 msgstr "パレットエディター"
 
 #. initialize the list of gimp palettes
-#: ../app/actions/actions.c:200 ../app/core/gimp.c:966
-#: ../app/dialogs/dialogs.c:325 ../app/dialogs/preferences-dialog.c:2752
+#: ../app/actions/actions.c:196 ../app/core/gimp.c:979
+#: ../app/dialogs/dialogs.c:326 ../app/dialogs/preferences-dialog.c:2585
 msgid "Palettes"
 msgstr "パレット"
 
 #. initialize the list of gimp patterns
-#: ../app/actions/actions.c:203 ../app/core/gimp.c:961
-#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2748
+#: ../app/actions/actions.c:199 ../app/core/gimp.c:974
+#: ../app/dialogs/dialogs.c:322 ../app/dialogs/preferences-dialog.c:2581
 msgid "Patterns"
 msgstr "パターン"
 
-#: ../app/actions/actions.c:206 ../app/dialogs/preferences-dialog.c:2768
+#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2601
 msgid "Plug-Ins"
 msgstr "プラグイン"
 
 #. Quick Mask Color
-#: ../app/actions/actions.c:209 ../app/core/gimpchannel.c:385
-#: ../app/dialogs/preferences-dialog.c:2026
+#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:389
+#: ../app/dialogs/preferences-dialog.c:1850
 msgid "Quick Mask"
 msgstr "クイックマスク"
 
-#: ../app/actions/actions.c:212 ../app/dialogs/dialogs.c:372
+#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:373
 msgid "Sample Points"
 msgstr "サンプルポイント"
 
-#: ../app/actions/actions.c:215
+#: ../app/actions/actions.c:211
 msgid "Select"
 msgstr "選択"
 
 #. initialize the template list
-#: ../app/actions/actions.c:218 ../app/core/gimp.c:989
-#: ../app/dialogs/dialogs.c:333
+#: ../app/actions/actions.c:214 ../app/core/gimp.c:1002
+#: ../app/dialogs/dialogs.c:334
 msgid "Templates"
 msgstr "テンプレート"
 
-#: ../app/actions/actions.c:221
+#: ../app/actions/actions.c:217
 msgid "Text Tool"
 msgstr "テキストツール"
 
-#: ../app/actions/actions.c:224
+#: ../app/actions/actions.c:220
 msgid "Text Editor"
 msgstr "テキストエディター"
 
-#: ../app/actions/actions.c:227 ../app/dialogs/dialogs.c:300
-#: ../app/dialogs/preferences-dialog.c:1855 ../app/gui/gui.c:424
+#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:301
+#: ../app/gui/gui.c:426
 msgid "Tool Options"
 msgstr "ツールオプション"
 
-#: ../app/actions/actions.c:230 ../app/widgets/gimptoolpalette.c:389
+#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:380
 msgid "Tools"
 msgstr "ツールアイコン"
 
-#: ../app/actions/actions.c:233 ../app/dialogs/dialogs.c:352
+#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:353
 #: ../app/tools/gimpvectortool.c:160
 msgid "Paths"
 msgstr "パス"
 
-#: ../app/actions/actions.c:236
+#: ../app/actions/actions.c:232
 msgid "View"
 msgstr "表示"
 
-#: ../app/actions/actions.c:239
+#: ../app/actions/actions.c:235
 msgid "Windows"
 msgstr "ウィンドウ"
 
 #. value description and new value shown in the status bar
-#: ../app/actions/actions.c:588
+#: ../app/actions/actions.c:584
 #, c-format
 msgid "%s: %.2f"
 msgstr "%s: %.2f"
 
 #. value description and new value shown in the status bar
-#: ../app/actions/actions.c:614
+#: ../app/actions/actions.c:610
 #, c-format
 msgid "%s: %d"
 msgstr "%s: %d"
@@ -775,14 +760,14 @@ msgstr "チャンネル表示色の変更"
 msgid "_Fill opacity:"
 msgstr "不透明度(_F):"
 
-#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:270
-#: ../app/widgets/gimpchanneltreeview.c:331
+#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:274
+#: ../app/widgets/gimpchanneltreeview.c:332
 msgid "Channel"
 msgstr "チャンネル"
 
 #: ../app/actions/channels-commands.c:117
 #: ../app/actions/channels-commands.c:159
-#: ../app/widgets/gimpchanneltreeview.c:326
+#: ../app/widgets/gimpchanneltreeview.c:327
 msgid "New Channel"
 msgstr "新規チャンネル"
 
@@ -794,10 +779,10 @@ msgstr "新しいチャンネルの追加"
 msgid "New Channel Color"
 msgstr "チャンネル表示色"
 
-#: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:256
-#: ../app/display/gimpdisplayshell-dnd.c:628
-#: ../app/widgets/gimpchanneltreeview.c:258
-#: ../app/widgets/gimplayertreeview.c:776
+#: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:257
+#: ../app/display/gimpdisplayshell-dnd.c:642
+#: ../app/widgets/gimpchanneltreeview.c:259
+#: ../app/widgets/gimplayertreeview.c:778
 #, c-format
 msgid "%s Channel Copy"
 msgstr "%s チャンネルのコピー"
@@ -846,16 +831,6 @@ msgstr "インデックス #%d の色の変更"
 msgid "Edit Colormap Entry"
 msgstr "インデックスカラーの変更"
 
-#: ../app/actions/config-actions.c:38
-msgctxt "config-action"
-msgid "Use _GEGL"
-msgstr "GEGL の利用(_G)"
-
-#: ../app/actions/config-actions.c:39
-msgctxt "config-action"
-msgid "If possible, use GEGL for image processing"
-msgstr "この設定をオンにすると、可能な限り GEGL を画像処理に使用します"
-
 #: ../app/actions/context-actions.c:47
 msgctxt "context-action"
 msgid "_Context"
@@ -977,31 +952,31 @@ msgid "Brush Angle: %2.2f"
 msgstr "ブラシの角度: %2.2f"
 
 # 'pointer information' は直訳すれば「ポインター情報」だが、機能内容はポインターが指しているピクセルに関する情報の表示なので、機能を直接的に表す「ピクセル情報」とした
-#: ../app/actions/cursor-info-actions.c:40
+#: ../app/actions/cursor-info-actions.c:41
 msgctxt "cursor-info-action"
 msgid "Pointer Information Menu"
 msgstr "ピクセル情報メニュー"
 
-#: ../app/actions/cursor-info-actions.c:47
+#: ../app/actions/cursor-info-actions.c:48
 msgctxt "cursor-info-action"
 msgid "_Sample Merged"
 msgstr "見えている色の情報を表示(_S)"
 
-#: ../app/actions/cursor-info-actions.c:48
+#: ../app/actions/cursor-info-actions.c:49
 msgctxt "cursor-info-action"
 msgid "Use the composite color of all visible layers"
 msgstr ""
 "この設定がオンのときは、画像ウィンドウ上で見えている色の情報を表示します。オ"
 "フのときはアクティブなレイヤー上の色情報を表示します。"
 
-#: ../app/actions/data-commands.c:90 ../app/actions/documents-commands.c:345
-#: ../app/actions/file-commands.c:194 ../app/dialogs/file-open-dialog.c:232
-#: ../app/dialogs/file-open-dialog.c:277
+#: ../app/actions/data-commands.c:90 ../app/actions/documents-commands.c:353
+#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:226
+#: ../app/dialogs/file-open-dialog.c:270
 #: ../app/dialogs/file-open-location-dialog.c:214
 #: ../app/dialogs/file-open-location-dialog.c:226
-#: ../app/display/gimpdisplayshell-dnd.c:574
-#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox.c:834
-#: ../app/widgets/gimptoolbox-dnd.c:170
+#: ../app/display/gimpdisplayshell-dnd.c:588
+#: ../app/widgets/gimplayertreeview.c:738 ../app/widgets/gimptoolbox.c:802
+#: ../app/widgets/gimptoolbox-dnd.c:168
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -1014,189 +989,189 @@ msgstr ""
 
 #: ../app/actions/data-commands.c:119
 #: ../app/actions/tool-options-commands.c:73
-#: ../app/core/gimpbrushgenerated-load.c:123 ../app/core/gimpimage.c:1642
-#: ../app/core/gimppalette.c:399 ../app/core/gimppalette-import.c:210
-#: ../app/core/gimppalette-load.c:225
+#: ../app/core/gimpbrushgenerated-load.c:124 ../app/core/gimpimage.c:1753
+#: ../app/core/gimppalette.c:399 ../app/core/gimppalette-import.c:213
+#: ../app/core/gimppalette-load.c:234
 #: ../app/dialogs/palette-import-dialog.c:771 ../app/widgets/gimpdnd-xds.c:94
 msgid "Untitled"
 msgstr "名称未設定"
 
-#: ../app/actions/dialogs-actions.c:49
+#: ../app/actions/dialogs-actions.c:47
 msgctxt "windows-action"
 msgid "Tool_box"
 msgstr "ツールボックス(_B)"
 
-#: ../app/actions/dialogs-actions.c:55
+#: ../app/actions/dialogs-actions.c:53
 msgctxt "dialogs-action"
 msgid "Tool _Options"
 msgstr "ツールオプション(_O)"
 
-#: ../app/actions/dialogs-actions.c:56
+#: ../app/actions/dialogs-actions.c:54
 msgctxt "dialogs-action"
 msgid "Open the tool options dialog"
 msgstr ""
 "ツールオプションダイアログを開きます。アクティブなツールのオプション設定を行"
 "います。"
 
-#: ../app/actions/dialogs-actions.c:61
+#: ../app/actions/dialogs-actions.c:59
 msgctxt "dialogs-action"
 msgid "_Device Status"
 msgstr "デバイスの状態(_D)"
 
-#: ../app/actions/dialogs-actions.c:62
+#: ../app/actions/dialogs-actions.c:60
 msgctxt "dialogs-action"
 msgid "Open the device status dialog"
 msgstr "[デバイスの状態] ダイアログを開きます。"
 
-#: ../app/actions/dialogs-actions.c:67
+#: ../app/actions/dialogs-actions.c:65
 msgctxt "dialogs-action"
 msgid "_Layers"
 msgstr "レイヤー(_L)"
 
-#: ../app/actions/dialogs-actions.c:68
+#: ../app/actions/dialogs-actions.c:66
 msgctxt "dialogs-action"
 msgid "Open the layers dialog"
 msgstr "レイヤーダイアログを開きます。レイヤーの状態を一覧表示します。"
 
-#: ../app/actions/dialogs-actions.c:73
+#: ../app/actions/dialogs-actions.c:71
 msgctxt "dialogs-action"
 msgid "_Channels"
 msgstr "チャンネル(_C)"
 
-#: ../app/actions/dialogs-actions.c:74
+#: ../app/actions/dialogs-actions.c:72
 msgctxt "dialogs-action"
 msgid "Open the channels dialog"
 msgstr "チャンネルダイアログを開きます。チャンネルの状態を一覧表示します。"
 
-#: ../app/actions/dialogs-actions.c:79
+#: ../app/actions/dialogs-actions.c:77
 msgctxt "dialogs-action"
 msgid "_Paths"
 msgstr "パス(_P)"
 
-#: ../app/actions/dialogs-actions.c:80
+#: ../app/actions/dialogs-actions.c:78
 msgctxt "dialogs-action"
 msgid "Open the paths dialog"
 msgstr "パスダイアログを開きます。パスの状態を一覧表示します。"
 
-#: ../app/actions/dialogs-actions.c:85
+#: ../app/actions/dialogs-actions.c:83
 msgctxt "dialogs-action"
 msgid "Color_map"
 msgstr "カラーマップ(_M)"
 
-#: ../app/actions/dialogs-actions.c:86
+#: ../app/actions/dialogs-actions.c:84
 msgctxt "dialogs-action"
 msgid "Open the colormap dialog"
 msgstr ""
 "カラーマップダイアログを開きます。現在のカラーマップの状態を表示します。"
 
-#: ../app/actions/dialogs-actions.c:91
+#: ../app/actions/dialogs-actions.c:89
 msgctxt "dialogs-action"
 msgid "Histogra_m"
 msgstr "ヒストグラム(_M)"
 
-#: ../app/actions/dialogs-actions.c:92
+#: ../app/actions/dialogs-actions.c:90
 msgctxt "dialogs-action"
 msgid "Open the histogram dialog"
 msgstr ""
 "ヒストグラムダイアログを開きます。アクティブな画像のヒストグラムを表示しま"
 "す。"
 
-#: ../app/actions/dialogs-actions.c:97
+#: ../app/actions/dialogs-actions.c:95
 msgctxt "dialogs-action"
 msgid "_Selection Editor"
 msgstr "選択範囲エディター(_S)"
 
-#: ../app/actions/dialogs-actions.c:98
+#: ../app/actions/dialogs-actions.c:96
 msgctxt "dialogs-action"
 msgid "Open the selection editor"
 msgstr ""
 "選択範囲エディター (ダイアログ) を開きます。ダイアログ上で選択範囲をグレース"
 "ケール画像として表示します。"
 
-#: ../app/actions/dialogs-actions.c:103
+#: ../app/actions/dialogs-actions.c:101
 msgctxt "dialogs-action"
 msgid "Na_vigation"
 msgstr "ナビゲーション(_V)"
 
-#: ../app/actions/dialogs-actions.c:104
+#: ../app/actions/dialogs-actions.c:102
 msgctxt "dialogs-action"
 msgid "Open the display navigation dialog"
 msgstr ""
 "ナビゲーションダイアログを開きます。ダイアログ上でアクティブな画像をナビゲー"
 "トします。"
 
-#: ../app/actions/dialogs-actions.c:109
+#: ../app/actions/dialogs-actions.c:107
 msgctxt "dialogs-action"
 msgid "Undo _History"
 msgstr "作業履歴(_H)"
 
-#: ../app/actions/dialogs-actions.c:110
+#: ../app/actions/dialogs-actions.c:108
 msgctxt "dialogs-action"
 msgid "Open the undo history dialog"
 msgstr "作業履歴ダイアログを開きます。この画像で行った作業の一覧を表示します。"
 
 # 'pointer' は直訳すれば「ポインター」だが、機能内容はマウスポインターが指しているピクセルに関する情報の表示なので、機能を直接的に表す「ピクセル情報」とした
-#: ../app/actions/dialogs-actions.c:115
+#: ../app/actions/dialogs-actions.c:113
 msgctxt "dialogs-action"
 msgid "Pointer"
 msgstr "ピクセル情報"
 
 # 'pointer information' は直訳すれば「ポインター情報」だが、機能内容はポインターが指しているピクセルに関する情報の表示なので、機能を直接的に表す「ピクセル情報」とした
-#: ../app/actions/dialogs-actions.c:116
+#: ../app/actions/dialogs-actions.c:114
 msgctxt "dialogs-action"
 msgid "Open the pointer information dialog"
 msgstr ""
 "ピクセル情報ダイアログを開きます。ポインターが指すピクセルの情報を表示しま"
 "す。"
 
-#: ../app/actions/dialogs-actions.c:121
+#: ../app/actions/dialogs-actions.c:119
 msgctxt "dialogs-action"
 msgid "_Sample Points"
 msgstr "サンプルポイント(_S)"
 
-#: ../app/actions/dialogs-actions.c:122
+#: ../app/actions/dialogs-actions.c:120
 msgctxt "dialogs-action"
 msgid "Open the sample points dialog"
 msgstr ""
 "サンプルポイントダイアログを開きます。サンプルポイントに指定されているピクセ"
 "ルの情報を表示します。"
 
-#: ../app/actions/dialogs-actions.c:127
+#: ../app/actions/dialogs-actions.c:125
 msgctxt "dialogs-action"
 msgid "Colo_rs"
 msgstr "描画色/背景色(_R)"
 
-#: ../app/actions/dialogs-actions.c:128
+#: ../app/actions/dialogs-actions.c:126
 msgctxt "dialogs-action"
 msgid "Open the FG/BG color dialog"
 msgstr "[描画色/背景色] ダイアログを開きます。描画色と背景色を設定します。"
 
-#: ../app/actions/dialogs-actions.c:133
+#: ../app/actions/dialogs-actions.c:131
 msgctxt "dialogs-action"
 msgid "_Brushes"
 msgstr "ブラシ(_B)"
 
-#: ../app/actions/dialogs-actions.c:134
+#: ../app/actions/dialogs-actions.c:132
 msgctxt "dialogs-action"
 msgid "Open the brushes dialog"
 msgstr "ブラシダイアログを開きます。利用可能なブラシの一覧を表示します。"
 
-#: ../app/actions/dialogs-actions.c:139
+#: ../app/actions/dialogs-actions.c:137
 msgctxt "dialogs-action"
 msgid "Brush Editor"
 msgstr "ブラシの編集"
 
-#: ../app/actions/dialogs-actions.c:140
+#: ../app/actions/dialogs-actions.c:138
 msgctxt "dialogs-action"
 msgid "Open the brush editor"
 msgstr "ブラシエディターを開いてブラシを編集します"
 
-#: ../app/actions/dialogs-actions.c:145
+#: ../app/actions/dialogs-actions.c:143
 msgctxt "dialogs-action"
 msgid "Paint Dynamics"
 msgstr "描画の動的特性"
 
-#: ../app/actions/dialogs-actions.c:146
+#: ../app/actions/dialogs-actions.c:144
 msgctxt "dialogs-action"
 msgid "Open paint dynamics dialog"
 msgstr ""
@@ -1205,385 +1180,385 @@ msgstr ""
 "動的特性 (Paint Dynamics または Dynamics) とは、デバイスによる描画時の動的変"
 "化を描画結果にどう作用させるか設定したものです。"
 
-#: ../app/actions/dialogs-actions.c:151
+#: ../app/actions/dialogs-actions.c:149
 msgctxt "dialogs-action"
 msgid "Paint Dynamics Editor"
 msgstr "動的特性エディター"
 
-#: ../app/actions/dialogs-actions.c:152
+#: ../app/actions/dialogs-actions.c:150
 msgctxt "dialogs-action"
 msgid "Open the paint dynamics editor"
 msgstr "動的特性エディターを開いて動的特性を設定します"
 
-#: ../app/actions/dialogs-actions.c:157
+#: ../app/actions/dialogs-actions.c:155
 msgctxt "dialogs-action"
 msgid "P_atterns"
 msgstr "パターン(_A)"
 
-#: ../app/actions/dialogs-actions.c:158
+#: ../app/actions/dialogs-actions.c:156
 msgctxt "dialogs-action"
 msgid "Open the patterns dialog"
 msgstr "パターンダイアログを開きます。利用可能なパターンの一覧を表示します。"
 
-#: ../app/actions/dialogs-actions.c:163
+#: ../app/actions/dialogs-actions.c:161
 msgctxt "dialogs-action"
 msgid "_Gradients"
 msgstr "グラデーション(_G)"
 
-#: ../app/actions/dialogs-actions.c:164
+#: ../app/actions/dialogs-actions.c:162
 msgctxt "dialogs-action"
 msgid "Open the gradients dialog"
 msgstr ""
 "グラデーションダイアログを開きます。利用可能なグラデーションの一覧を表示しま"
 "す。"
 
-#: ../app/actions/dialogs-actions.c:169
+#: ../app/actions/dialogs-actions.c:167
 msgctxt "dialogs-action"
 msgid "Gradient Editor"
 msgstr "グラデーションの編集"
 
-#: ../app/actions/dialogs-actions.c:170
+#: ../app/actions/dialogs-actions.c:168
 msgctxt "dialogs-action"
 msgid "Open the gradient editor"
 msgstr "グラデーションエディターを開いてグラデーションを編集します"
 
-#: ../app/actions/dialogs-actions.c:175
+#: ../app/actions/dialogs-actions.c:173
 msgctxt "dialogs-action"
 msgid "Pal_ettes"
 msgstr "パレット(_E)"
 
-#: ../app/actions/dialogs-actions.c:176
+#: ../app/actions/dialogs-actions.c:174
 msgctxt "dialogs-action"
 msgid "Open the palettes dialog"
 msgstr "パレットダイアログを開きます。利用可能なパレットの一覧を表示します。"
 
-#: ../app/actions/dialogs-actions.c:181
+#: ../app/actions/dialogs-actions.c:179
 msgctxt "dialogs-action"
 msgid "Palette Editor"
 msgstr "パレットの編集"
 
-#: ../app/actions/dialogs-actions.c:182
+#: ../app/actions/dialogs-actions.c:180
 msgctxt "dialogs-action"
 msgid "Open the palette editor"
 msgstr "パレットエディターを開いてパレットを編集します"
 
-#: ../app/actions/dialogs-actions.c:187
+#: ../app/actions/dialogs-actions.c:185
 msgctxt "dialogs-action"
 msgid "Tool presets"
 msgstr "ツールプリセット"
 
-#: ../app/actions/dialogs-actions.c:188
+#: ../app/actions/dialogs-actions.c:186
 msgctxt "dialogs-action"
 msgid "Open tool presets dialog"
 msgstr ""
 "ツールプリセットダイアログを開きます。利用可能なツールプリセットの一覧を表示"
 "します。"
 
-#: ../app/actions/dialogs-actions.c:193
+#: ../app/actions/dialogs-actions.c:191
 msgctxt "dialogs-action"
 msgid "_Fonts"
 msgstr "フォント(_F)"
 
-#: ../app/actions/dialogs-actions.c:194
+#: ../app/actions/dialogs-actions.c:192
 msgctxt "dialogs-action"
 msgid "Open the fonts dialog"
 msgstr "フォントダイアログを開きます。利用可能なフォントの一覧を表示します。"
 
-#: ../app/actions/dialogs-actions.c:199
+#: ../app/actions/dialogs-actions.c:197
 msgctxt "dialogs-action"
 msgid "B_uffers"
 msgstr "バッファー(_U)"
 
-#: ../app/actions/dialogs-actions.c:200
+#: ../app/actions/dialogs-actions.c:198
 msgctxt "dialogs-action"
 msgid "Open the named buffers dialog"
 msgstr ""
 "バッファーダイアログを開きます。名前付きで保存されているバッファーの一覧を表"
 "示します。"
 
-#: ../app/actions/dialogs-actions.c:205
+#: ../app/actions/dialogs-actions.c:203
 msgctxt "dialogs-action"
 msgid "_Images"
 msgstr "画像一覧(_I)"
 
-#: ../app/actions/dialogs-actions.c:206
+#: ../app/actions/dialogs-actions.c:204
 msgctxt "dialogs-action"
 msgid "Open the images dialog"
 msgstr "[画像] ダイアログを開きます。現在開いている画像の一覧を表示します。"
 
-#: ../app/actions/dialogs-actions.c:211
+#: ../app/actions/dialogs-actions.c:209
 msgctxt "dialogs-action"
 msgid "Document Histor_y"
 msgstr "ファイル履歴(_Y)"
 
-#: ../app/actions/dialogs-actions.c:212
+#: ../app/actions/dialogs-actions.c:210
 msgctxt "dialogs-action"
 msgid "Open the document history dialog"
 msgstr ""
 "ファイル履歴ダイアログを開きます。これまでに GIMP で開いたファイルの履歴を表"
 "示します。"
 
-#: ../app/actions/dialogs-actions.c:217
+#: ../app/actions/dialogs-actions.c:215
 msgctxt "dialogs-action"
 msgid "_Templates"
 msgstr "テンプレート(_T)"
 
-#: ../app/actions/dialogs-actions.c:218
+#: ../app/actions/dialogs-actions.c:216
 msgctxt "dialogs-action"
 msgid "Open the image templates dialog"
 msgstr ""
 "テンプレートダイアログを開きます。利用可能な画像テンプレート (幅・高さ・解像"
 "度のひな型) の一覧を表示します。"
 
-#: ../app/actions/dialogs-actions.c:223
+#: ../app/actions/dialogs-actions.c:221
 msgctxt "dialogs-action"
 msgid "Error Co_nsole"
 msgstr "エラーコンソール(_N)"
 
-#: ../app/actions/dialogs-actions.c:224
+#: ../app/actions/dialogs-actions.c:222
 msgctxt "dialogs-action"
 msgid "Open the error console"
 msgstr ""
 "エラーコンソールを開きます。現在のセッションで発生したエラーを表示します。"
 
-#: ../app/actions/dialogs-actions.c:234
+#: ../app/actions/dialogs-actions.c:232
 msgctxt "dialogs-action"
 msgid "_Preferences"
 msgstr "設定(_P)"
 
-#: ../app/actions/dialogs-actions.c:235
+#: ../app/actions/dialogs-actions.c:233
 msgctxt "dialogs-action"
 msgid "Open the preferences dialog"
 msgstr "設定ダイアログを開きます。GIMP の実行環境を設定します。"
 
-#: ../app/actions/dialogs-actions.c:240
+#: ../app/actions/dialogs-actions.c:238
 msgctxt "dialogs-action"
 msgid "_Input Devices"
 msgstr "入力デバイスの設定(_I)"
 
-#: ../app/actions/dialogs-actions.c:241
+#: ../app/actions/dialogs-actions.c:239
 msgctxt "dialogs-action"
 msgid "Open the input devices editor"
 msgstr ""
 "入力デバイスエディターを開きます。入力デバイスのオプションを設定します。"
 
-#: ../app/actions/dialogs-actions.c:246
+#: ../app/actions/dialogs-actions.c:244
 msgctxt "dialogs-action"
 msgid "_Keyboard Shortcuts"
 msgstr "キーボードショートカット(_K)"
 
-#: ../app/actions/dialogs-actions.c:247
+#: ../app/actions/dialogs-actions.c:245
 msgctxt "dialogs-action"
 msgid "Open the keyboard shortcuts editor"
 msgstr ""
 "キーボードショートカットエディターを開いてキーボードショートカットを設定しま"
 "す"
 
-#: ../app/actions/dialogs-actions.c:252
+#: ../app/actions/dialogs-actions.c:250
 msgctxt "dialogs-action"
 msgid "_Modules"
 msgstr "モジュール(_M)"
 
-#: ../app/actions/dialogs-actions.c:253
+#: ../app/actions/dialogs-actions.c:251
 msgctxt "dialogs-action"
 msgid "Open the module manager dialog"
 msgstr ""
 "モジュールマネージャーダイアログを開いて GIMP に組み込むモジュールを指定しま"
 "す"
 
-#: ../app/actions/dialogs-actions.c:258
+#: ../app/actions/dialogs-actions.c:256
 msgctxt "dialogs-action"
 msgid "_Tip of the Day"
 msgstr "今日の技(_T)"
 
-#: ../app/actions/dialogs-actions.c:259
+#: ../app/actions/dialogs-actions.c:257
 msgctxt "dialogs-action"
 msgid "Show some helpful tips on using GIMP"
 msgstr "GIMP を上手に使うための Tip 集を表示します"
 
-#: ../app/actions/dialogs-actions.c:264
+#: ../app/actions/dialogs-actions.c:262
 msgctxt "dialogs-action"
 msgid "_About"
 msgstr "このアプリケーションについて(_A)"
 
-#: ../app/actions/dialogs-actions.c:265
+#: ../app/actions/dialogs-actions.c:263
 msgctxt "dialogs-action"
 msgid "About GIMP"
 msgstr "このアプリケーションの情報を表示します"
 
-#: ../app/actions/dialogs-actions.c:328
-#: ../app/dialogs/preferences-dialog.c:1945 ../app/widgets/gimptoolbox.c:556
+#: ../app/actions/dialogs-actions.c:326
+#: ../app/dialogs/preferences-dialog.c:1771 ../app/widgets/gimptoolbox.c:535
 msgid "Toolbox"
 msgstr "ツールボックス"
 
-#: ../app/actions/dialogs-actions.c:329
+#: ../app/actions/dialogs-actions.c:327
 msgid "Raise the toolbox"
 msgstr "ツールボックスを前面に表示します"
 
-#: ../app/actions/dialogs-actions.c:333
+#: ../app/actions/dialogs-actions.c:331
 msgid "New Toolbox"
 msgstr "新しいツールボックス"
 
-#: ../app/actions/dialogs-actions.c:334
+#: ../app/actions/dialogs-actions.c:332
 msgid "Create a new toolbox"
 msgstr "新しいツールボックスを作成します"
 
-#: ../app/actions/dockable-actions.c:48
+#: ../app/actions/dockable-actions.c:49
 msgctxt "dockable-action"
 msgid "Dialogs Menu"
 msgstr "ダイアログメニュー"
 
-#: ../app/actions/dockable-actions.c:53
+#: ../app/actions/dockable-actions.c:54
 msgctxt "dockable-action"
 msgid "_Add Tab"
 msgstr "タブの追加(_A)"
 
-#: ../app/actions/dockable-actions.c:55
+#: ../app/actions/dockable-actions.c:56
 msgctxt "dockable-action"
 msgid "_Preview Size"
 msgstr "プレビューサイズ(_P)"
 
-#: ../app/actions/dockable-actions.c:57
+#: ../app/actions/dockable-actions.c:58
 msgctxt "dockable-action"
 msgid "_Tab Style"
 msgstr "タブの見出し(_T)"
 
-#: ../app/actions/dockable-actions.c:60
+#: ../app/actions/dockable-actions.c:61
 msgctxt "dockable-action"
 msgid "_Close Tab"
 msgstr "タブを閉じる(_C)"
 
-#: ../app/actions/dockable-actions.c:65
+#: ../app/actions/dockable-actions.c:66
 msgctxt "dockable-action"
 msgid "_Detach Tab"
 msgstr "タブの切り放し(_D)"
 
-#: ../app/actions/dockable-actions.c:84
+#: ../app/actions/dockable-actions.c:85
 msgctxt "preview-size"
 msgid "_Tiny"
 msgstr "微小(_T)"
 
-#: ../app/actions/dockable-actions.c:86
+#: ../app/actions/dockable-actions.c:87
 msgctxt "preview-size"
 msgid "E_xtra Small"
 msgstr "とても小さい(_X)"
 
-#: ../app/actions/dockable-actions.c:88
+#: ../app/actions/dockable-actions.c:89
 msgctxt "preview-size"
 msgid "_Small"
 msgstr "小さい(_S)"
 
-#: ../app/actions/dockable-actions.c:90
+#: ../app/actions/dockable-actions.c:91
 msgctxt "preview-size"
 msgid "_Medium"
 msgstr "中間(_M)"
 
-#: ../app/actions/dockable-actions.c:92
+#: ../app/actions/dockable-actions.c:93
 msgctxt "preview-size"
 msgid "_Large"
 msgstr "大きい(_L)"
 
-#: ../app/actions/dockable-actions.c:94
+#: ../app/actions/dockable-actions.c:95
 msgctxt "preview-size"
 msgid "Ex_tra Large"
 msgstr "やや大きい(_T)"
 
-#: ../app/actions/dockable-actions.c:96
+#: ../app/actions/dockable-actions.c:97
 msgctxt "preview-size"
 msgid "_Huge"
 msgstr "とても大きい(_H)"
 
-#: ../app/actions/dockable-actions.c:98
+#: ../app/actions/dockable-actions.c:99
 msgctxt "preview-size"
 msgid "_Enormous"
 msgstr "巨大(_E)"
 
-#: ../app/actions/dockable-actions.c:100
+#: ../app/actions/dockable-actions.c:101
 msgctxt "preview-size"
 msgid "_Gigantic"
 msgstr "超巨大(_G)"
 
-#: ../app/actions/dockable-actions.c:106
+#: ../app/actions/dockable-actions.c:107
 msgctxt "tab-style"
 msgid "_Icon"
 msgstr "アイコン(_I)"
 
-#: ../app/actions/dockable-actions.c:108
+#: ../app/actions/dockable-actions.c:109
 msgctxt "tab-style"
 msgid "Current _Status"
 msgstr "現在の状態(_S)"
 
-#: ../app/actions/dockable-actions.c:110
+#: ../app/actions/dockable-actions.c:111
 msgctxt "tab-style"
 msgid "_Text"
 msgstr "文字(_T)"
 
-#: ../app/actions/dockable-actions.c:112
+#: ../app/actions/dockable-actions.c:113
 msgctxt "tab-style"
 msgid "I_con & Text"
 msgstr "アイコンと文字(_C)"
 
-#: ../app/actions/dockable-actions.c:114
+#: ../app/actions/dockable-actions.c:115
 msgctxt "tab-style"
 msgid "St_atus & Text"
 msgstr "状態と文字(_A)"
 
-#: ../app/actions/dockable-actions.c:116 ../app/widgets/widgets-enums.c:224
+#: ../app/actions/dockable-actions.c:117 ../app/widgets/widgets-enums.c:224
 msgctxt "tab-style"
 msgid "Automatic"
 msgstr "自動"
 
-#: ../app/actions/dockable-actions.c:126
+#: ../app/actions/dockable-actions.c:127
 msgctxt "dockable-action"
 msgid "Loc_k Tab to Dock"
 msgstr "タブのロック(_K)"
 
-#: ../app/actions/dockable-actions.c:128
+#: ../app/actions/dockable-actions.c:129
 msgctxt "dockable-action"
 msgid "Protect this tab from being dragged with the mouse pointer"
 msgstr "このタブをドラッグ禁止に設定します"
 
-#: ../app/actions/dockable-actions.c:134
+#: ../app/actions/dockable-actions.c:135
 msgctxt "dockable-action"
 msgid "Show _Button Bar"
 msgstr "ボタンバーの表示(_B)"
 
-#: ../app/actions/dockable-actions.c:143
+#: ../app/actions/dockable-actions.c:144
 msgctxt "dockable-action"
 msgid "View as _List"
 msgstr "一覧で表示(_L)"
 
-#: ../app/actions/dockable-actions.c:148
+#: ../app/actions/dockable-actions.c:149
 msgctxt "dockable-action"
 msgid "View as _Grid"
 msgstr "並べて表示(_G)"
 
-#: ../app/actions/dock-actions.c:45
+#: ../app/actions/dock-actions.c:46
 msgctxt "dock-action"
 msgid "M_ove to Screen"
 msgstr "スクリーンに移動(_O)"
 
-#: ../app/actions/dock-actions.c:49
+#: ../app/actions/dock-actions.c:50
 msgctxt "dock-action"
 msgid "Close Dock"
 msgstr "ドックを閉じる"
 
-#: ../app/actions/dock-actions.c:54
+#: ../app/actions/dock-actions.c:55
 msgctxt "dock-action"
 msgid "_Open Display..."
 msgstr "ディスプレイを開く(_O)..."
 
-#: ../app/actions/dock-actions.c:55
+#: ../app/actions/dock-actions.c:56
 msgctxt "dock-action"
 msgid "Connect to another display"
 msgstr "別のディスプレイに接続する"
 
-#: ../app/actions/dock-actions.c:63
+#: ../app/actions/dock-actions.c:64
 msgctxt "dock-action"
 msgid "_Show Image Selection"
 msgstr "画像選択ボックスの表示(_S)"
 
-#: ../app/actions/dock-actions.c:69
+#: ../app/actions/dock-actions.c:70
 msgctxt "dock-action"
 msgid "Auto _Follow Active Image"
 msgstr "アクティブな画像を自動的に追跡(_F)"
@@ -1726,6 +1701,8 @@ msgstr "ピクセルの階調を反転します"
 
 #: ../app/actions/drawable-actions.c:57
 #, fuzzy
+#| msgctxt "select-action"
+#| msgid "_Invert"
 msgctxt "drawable-action"
 msgid "_Value Invert"
 msgstr "選択範囲の反転(_I)"
@@ -1788,62 +1765,78 @@ msgctxt "drawable-action"
 msgid "Keep the pixels on this drawable from being modified"
 msgstr "ピクセルが変更されないように保護します"
 
-#: ../app/actions/drawable-actions.c:104
+#: ../app/actions/drawable-actions.c:101
+#, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Reposition channel"
+msgctxt "drawable-action"
+msgid "L_ock position of channel"
+msgstr "チャンネルの再配置"
+
+#: ../app/actions/drawable-actions.c:103
+#, fuzzy
+#| msgctxt "drawable-action"
+#| msgid "Keep the pixels on this drawable from being modified"
+msgctxt "drawable-action"
+msgid "Keep the position on this drawable from being modified"
+msgstr "ピクセルが変更されないように保護します"
+
+#: ../app/actions/drawable-actions.c:112
 msgctxt "drawable-action"
 msgid "Flip _Horizontally"
 msgstr "水平反転(_H)"
 
-#: ../app/actions/drawable-actions.c:105
+#: ../app/actions/drawable-actions.c:113
 msgctxt "drawable-action"
 msgid "Flip horizontally"
 msgstr "レイヤーの左右を鏡像反転します"
 
-#: ../app/actions/drawable-actions.c:110
+#: ../app/actions/drawable-actions.c:118
 msgctxt "drawable-action"
 msgid "Flip _Vertically"
 msgstr "垂直反転(_V)"
 
-#: ../app/actions/drawable-actions.c:111
+#: ../app/actions/drawable-actions.c:119
 msgctxt "drawable-action"
 msgid "Flip vertically"
 msgstr "レイヤーの上下を鏡像反転します"
 
-#: ../app/actions/drawable-actions.c:119
+#: ../app/actions/drawable-actions.c:127
 msgctxt "drawable-action"
 msgid "Rotate 90° _clockwise"
 msgstr "時計回りに 90 度回転(_C)"
 
-#: ../app/actions/drawable-actions.c:120
+#: ../app/actions/drawable-actions.c:128
 msgctxt "drawable-action"
 msgid "Rotate 90 degrees to the right"
 msgstr "アイテムを時計回り (右) に 90 度回転します"
 
-#: ../app/actions/drawable-actions.c:125
+#: ../app/actions/drawable-actions.c:133
 msgctxt "drawable-action"
 msgid "Rotate _180°"
 msgstr "180 度回転(_1)"
 
-#: ../app/actions/drawable-actions.c:126
+#: ../app/actions/drawable-actions.c:134
 msgctxt "drawable-action"
 msgid "Turn upside-down"
 msgstr "180 度回転します"
 
-#: ../app/actions/drawable-actions.c:131
+#: ../app/actions/drawable-actions.c:139
 msgctxt "drawable-action"
 msgid "Rotate 90° counter-clock_wise"
 msgstr "反時計回りに 90 度回転(_W)"
 
-#: ../app/actions/drawable-actions.c:132
+#: ../app/actions/drawable-actions.c:140
 msgctxt "drawable-action"
 msgid "Rotate 90 degrees to the left"
 msgstr "アイテムを反時計回り (左) に 90 度回転します"
 
-#: ../app/actions/drawable-commands.c:71 ../app/actions/drawable-commands.c:87
-#: ../app/pdb/color-cmds.c:373
+#: ../app/actions/drawable-commands.c:72 ../app/actions/drawable-commands.c:88
+#: ../app/pdb/color-cmds.c:387
 msgid "Invert"
 msgstr "反転"
 
-#: ../app/actions/drawable-commands.c:108
+#: ../app/actions/drawable-commands.c:109
 msgid "White Balance operates only on RGB color layers."
 msgstr "ホワイトバランスの調整は RGB レイヤーにのみ有効です"
 
@@ -1922,53 +1915,53 @@ msgctxt "dynamics-editor-action"
 msgid "Edit Active Dynamics"
 msgstr "現在の動的特性を設定"
 
-#: ../app/actions/edit-actions.c:63
+#: ../app/actions/edit-actions.c:65
 msgctxt "edit-action"
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../app/actions/edit-actions.c:64
+#: ../app/actions/edit-actions.c:66
 msgctxt "edit-action"
 msgid "Paste _as"
 msgstr "クリップボードから生成(_A)"
 
-#: ../app/actions/edit-actions.c:65
+#: ../app/actions/edit-actions.c:67
 msgctxt "edit-action"
 msgid "_Buffer"
 msgstr "バッファー操作(_B)"
 
-#: ../app/actions/edit-actions.c:68
+#: ../app/actions/edit-actions.c:70
 msgctxt "edit-action"
 msgid "Undo History Menu"
 msgstr "作業履歴メニュー"
 
-#: ../app/actions/edit-actions.c:72
+#: ../app/actions/edit-actions.c:74
 msgctxt "edit-action"
 msgid "_Undo"
 msgstr "元に戻す(_U)"
 
-#: ../app/actions/edit-actions.c:73
+#: ../app/actions/edit-actions.c:75
 msgctxt "edit-action"
 msgid "Undo the last operation"
 msgstr "直前の作業を取り消して 1 段階戻ります"
 
-#: ../app/actions/edit-actions.c:78
+#: ../app/actions/edit-actions.c:80
 msgctxt "edit-action"
 msgid "_Redo"
 msgstr "やり直す(_R)"
 
-#: ../app/actions/edit-actions.c:79
+#: ../app/actions/edit-actions.c:81
 msgctxt "edit-action"
 msgid "Redo the last operation that was undone"
 msgstr "取り消した作業をやり直して 1 段階進めます"
 
 # 直前の作業を取り消して 1 段階戻ります。直前の作業が視覚的な変更の場合は、さらに 1 段階戻ります。 (このコマンドのツールチップより)
-#: ../app/actions/edit-actions.c:84
+#: ../app/actions/edit-actions.c:86
 msgctxt "edit-action"
 msgid "Strong Undo"
 msgstr "元に戻す (スキップあり)"
 
-#: ../app/actions/edit-actions.c:85
+#: ../app/actions/edit-actions.c:87
 msgctxt "edit-action"
 msgid "Undo the last operation, skipping visibility changes"
 msgstr ""
@@ -1976,339 +1969,339 @@ msgstr ""
 "に 1 段階戻ります。"
 
 # 取り消した作業をやり直して 1 段階進めます。やり直すべき作業が視覚的な変更の場合は、さらに 1段階進めます。 (このコマンドのツールチップより)
-#: ../app/actions/edit-actions.c:90
+#: ../app/actions/edit-actions.c:92
 msgctxt "edit-action"
 msgid "Strong Redo"
 msgstr "やり直す (スキップあり)"
 
-#: ../app/actions/edit-actions.c:92
+#: ../app/actions/edit-actions.c:94
 msgctxt "edit-action"
 msgid "Redo the last operation that was undone, skipping visibility changes"
 msgstr ""
 "取り消した作業をやり直して 1 段階進めます。やり直すべき作業が視覚的な変更の場"
 "合は、さらに 1段階進めます。"
 
-#: ../app/actions/edit-actions.c:97
+#: ../app/actions/edit-actions.c:99
 msgctxt "edit-action"
 msgid "_Clear Undo History"
 msgstr "作業履歴の消去(_C)"
 
-#: ../app/actions/edit-actions.c:98
+#: ../app/actions/edit-actions.c:100
 msgctxt "edit-action"
 msgid "Remove all operations from the undo history"
 msgstr "すべての作業履歴を消去します"
 
-#: ../app/actions/edit-actions.c:103
+#: ../app/actions/edit-actions.c:105
 msgctxt "edit-action"
 msgid "_Fade..."
 msgstr "フェード(_F)..."
 
-#: ../app/actions/edit-actions.c:105
+#: ../app/actions/edit-actions.c:107
 msgctxt "edit-action"
 msgid "Modify paint mode and opacity of the last pixel manipulation"
 msgstr "描画モードと不透明度を変更して、前回の作業をやり直します"
 
-#: ../app/actions/edit-actions.c:110
+#: ../app/actions/edit-actions.c:112
 msgctxt "edit-action"
 msgid "Cu_t"
 msgstr "切り取り(_T)"
 
-#: ../app/actions/edit-actions.c:111
+#: ../app/actions/edit-actions.c:113
 msgctxt "edit-action"
 msgid "Move the selected pixels to the clipboard"
 msgstr "選択範囲のピクセルを切り取ってクリップボードに移動します"
 
-#: ../app/actions/edit-actions.c:116
+#: ../app/actions/edit-actions.c:118
 msgctxt "edit-action"
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: ../app/actions/edit-actions.c:117
+#: ../app/actions/edit-actions.c:119
 msgctxt "edit-action"
 msgid "Copy the selected pixels to the clipboard"
 msgstr "選択範囲のピクセルをクリップボードにコピーします"
 
 #. GIMP_STOCK_COPY_VISIBLE,
-#: ../app/actions/edit-actions.c:122
+#: ../app/actions/edit-actions.c:124
 msgctxt "edit-action"
 msgid "Copy _Visible"
 msgstr "可視部分のコピー(_V)"
 
-#: ../app/actions/edit-actions.c:123
+#: ../app/actions/edit-actions.c:125
 msgctxt "edit-action"
 msgid "Copy what is visible in the selected region"
 msgstr "選択範囲中で見えているものをコピーします"
 
-#: ../app/actions/edit-actions.c:128
+#: ../app/actions/edit-actions.c:130
 msgctxt "edit-action"
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
-#: ../app/actions/edit-actions.c:129
+#: ../app/actions/edit-actions.c:131
 msgctxt "edit-action"
 msgid "Paste the content of the clipboard"
 msgstr "クリップボードの内容を貼り付けます"
 
-#: ../app/actions/edit-actions.c:134
+#: ../app/actions/edit-actions.c:136
 msgctxt "edit-action"
 msgid "Paste _Into"
 msgstr "選択範囲内に貼り付け(_I)"
 
-#: ../app/actions/edit-actions.c:136
+#: ../app/actions/edit-actions.c:138
 msgctxt "edit-action"
 msgid "Paste the content of the clipboard into the current selection"
 msgstr "クリップボードの内容を選択範囲の中に貼り付けます"
 
-#: ../app/actions/edit-actions.c:141
+#: ../app/actions/edit-actions.c:143
 msgctxt "edit-action"
 msgid "From _Clipboard"
 msgstr "クリップボードから(_C)"
 
-#: ../app/actions/edit-actions.c:142 ../app/actions/edit-actions.c:148
+#: ../app/actions/edit-actions.c:144 ../app/actions/edit-actions.c:150
 msgctxt "edit-action"
 msgid "Create a new image from the content of the clipboard"
 msgstr "クリップボードの内容で画像を生成します"
 
-#: ../app/actions/edit-actions.c:147
+#: ../app/actions/edit-actions.c:149
 msgctxt "edit-action"
 msgid "_New Image"
 msgstr "画像(_N)"
 
-#: ../app/actions/edit-actions.c:153
+#: ../app/actions/edit-actions.c:155
 msgctxt "edit-action"
 msgid "New _Layer"
 msgstr "レイヤー(_L)"
 
-#: ../app/actions/edit-actions.c:154
+#: ../app/actions/edit-actions.c:156
 msgctxt "edit-action"
 msgid "Create a new layer from the content of the clipboard"
 msgstr "クリップボードの内容でレイヤーを生成します"
 
-#: ../app/actions/edit-actions.c:159
+#: ../app/actions/edit-actions.c:161
 msgctxt "edit-action"
 msgid "Cu_t Named..."
 msgstr "名前付きで切り取り(_T)..."
 
-#: ../app/actions/edit-actions.c:160
+#: ../app/actions/edit-actions.c:162
 msgctxt "edit-action"
 msgid "Move the selected pixels to a named buffer"
 msgstr "選択範囲のピクセルを切り取り、名前を付けてバッファーに移動します"
 
-#: ../app/actions/edit-actions.c:165
+#: ../app/actions/edit-actions.c:167
 msgctxt "edit-action"
 msgid "_Copy Named..."
 msgstr "名前付きでコピー(_C)..."
 
-#: ../app/actions/edit-actions.c:166
+#: ../app/actions/edit-actions.c:168
 msgctxt "edit-action"
 msgid "Copy the selected pixels to a named buffer"
 msgstr "選択範囲中のピクセルを名前付きバッファーとしてコピーします"
 
 #. GIMP_STOCK_COPY_VISIBLE,
-#: ../app/actions/edit-actions.c:171
+#: ../app/actions/edit-actions.c:173
 msgctxt "edit-action"
 msgid "Copy _Visible Named..."
 msgstr "可視部分を名前付きでコピー(_V)..."
 
-#: ../app/actions/edit-actions.c:173
+#: ../app/actions/edit-actions.c:175
 msgctxt "edit-action"
 msgid "Copy what is visible in the selected region to a named buffer"
 msgstr "選択範囲中で見えているものを名前付きバッファーとしてコピーします"
 
-#: ../app/actions/edit-actions.c:178
+#: ../app/actions/edit-actions.c:180
 msgctxt "edit-action"
 msgid "_Paste Named..."
 msgstr "名前を選んで貼り付け(_P)..."
 
-#: ../app/actions/edit-actions.c:179
+#: ../app/actions/edit-actions.c:181
 msgctxt "edit-action"
 msgid "Paste the content of a named buffer"
 msgstr "名前付きバッファーの中から選択して貼り付けます"
 
-#: ../app/actions/edit-actions.c:184
+#: ../app/actions/edit-actions.c:186
 msgctxt "edit-action"
 msgid "Cl_ear"
 msgstr "消去(_E)"
 
-#: ../app/actions/edit-actions.c:185
+#: ../app/actions/edit-actions.c:187
 msgctxt "edit-action"
 msgid "Clear the selected pixels"
 msgstr ""
 "選択範囲のピクセルを消去します (アクティブレイヤーにアルファチャンネルが無い"
 "ときは背景色で塗り潰します)"
 
-#: ../app/actions/edit-actions.c:193
+#: ../app/actions/edit-actions.c:195
 msgctxt "edit-action"
 msgid "Fill with _FG Color"
 msgstr "描画色で塗りつぶす(_F)"
 
-#: ../app/actions/edit-actions.c:194
+#: ../app/actions/edit-actions.c:196
 msgctxt "edit-action"
 msgid "Fill the selection using the foreground color"
 msgstr "選択範囲を描画色で塗りつぶします"
 
-#: ../app/actions/edit-actions.c:199
+#: ../app/actions/edit-actions.c:201
 msgctxt "edit-action"
 msgid "Fill with B_G Color"
 msgstr "背景色で塗りつぶす(_G)"
 
-#: ../app/actions/edit-actions.c:200
+#: ../app/actions/edit-actions.c:202
 msgctxt "edit-action"
 msgid "Fill the selection using the background color"
 msgstr "選択範囲を背景色で塗りつぶします"
 
-#: ../app/actions/edit-actions.c:205
+#: ../app/actions/edit-actions.c:207
 msgctxt "edit-action"
 msgid "Fill _with Pattern"
 msgstr "パターンで塗りつぶす(_W)"
 
-#: ../app/actions/edit-actions.c:206
+#: ../app/actions/edit-actions.c:208
 msgctxt "edit-action"
 msgid "Fill the selection using the active pattern"
 msgstr "選択範囲をアクティブなパターンで塗りつぶします"
 
-#: ../app/actions/edit-actions.c:304
+#: ../app/actions/edit-actions.c:315 ../app/actions/edit-actions.c:317
 #, c-format
 msgid "_Undo %s"
 msgstr "%s を元に戻す(_U)"
 
-#: ../app/actions/edit-actions.c:311
+#: ../app/actions/edit-actions.c:321 ../app/actions/edit-actions.c:323
 #, c-format
 msgid "_Redo %s"
 msgstr "%s をやり直す(_R)"
 
-#: ../app/actions/edit-actions.c:326
+#: ../app/actions/edit-actions.c:337
 #, c-format
 msgid "_Fade %s..."
 msgstr "%s をフェード(_F)..."
 
-#: ../app/actions/edit-actions.c:338
+#: ../app/actions/edit-actions.c:349
 msgid "_Undo"
 msgstr "元に戻す(_U)"
 
-#: ../app/actions/edit-actions.c:339
+#: ../app/actions/edit-actions.c:350
 msgid "_Redo"
 msgstr "やり直す(_R)"
 
-#: ../app/actions/edit-actions.c:340
+#: ../app/actions/edit-actions.c:351
 msgid "_Fade..."
 msgstr "フェード(_F)..."
 
-#: ../app/actions/edit-commands.c:137
+#: ../app/actions/edit-commands.c:149
 msgid "Clear Undo History"
 msgstr "作業履歴の消去"
 
-#: ../app/actions/edit-commands.c:163
+#: ../app/actions/edit-commands.c:175
 msgid "Really clear image's undo history?"
 msgstr "作業履歴を消去してもよろしいですか?"
 
-#: ../app/actions/edit-commands.c:176
+#: ../app/actions/edit-commands.c:188
 #, c-format
 msgid "Clearing the undo history of this image will gain %s of memory."
 msgstr "この画像の作業履歴を消去すると、使用メモリが %s 減ります"
 
-#: ../app/actions/edit-commands.c:206
+#: ../app/actions/edit-commands.c:218
 msgid "Cut pixels to the clipboard"
 msgstr "ピクセルを切り取り、クリップボードに移動します"
 
-#: ../app/actions/edit-commands.c:236 ../app/actions/edit-commands.c:265
+#: ../app/actions/edit-commands.c:248 ../app/actions/edit-commands.c:277
 msgid "Copied pixels to the clipboard"
 msgstr "クリップボードにコピーされたピクセル"
 
-#: ../app/actions/edit-commands.c:325 ../app/actions/edit-commands.c:361
-#: ../app/actions/edit-commands.c:544
+#: ../app/actions/edit-commands.c:337 ../app/actions/edit-commands.c:373
+#: ../app/actions/edit-commands.c:556
 msgid "There is no image data in the clipboard to paste."
 msgstr "クリップボードには貼り付けられる画像データがありません。"
 
-#: ../app/actions/edit-commands.c:349 ../app/core/gimpbrushclipboard.c:169
-#: ../app/core/gimppatternclipboard.c:170 ../app/widgets/gimpclipboard.c:346
+#: ../app/actions/edit-commands.c:361 ../app/core/gimpbrushclipboard.c:167
+#: ../app/core/gimppatternclipboard.c:168 ../app/widgets/gimpclipboard.c:346
 msgid "Clipboard"
 msgstr "クリップボード"
 
-#: ../app/actions/edit-commands.c:375
+#: ../app/actions/edit-commands.c:387
 msgid "Cut Named"
 msgstr "名前を付けて切り取り"
 
-#: ../app/actions/edit-commands.c:378 ../app/actions/edit-commands.c:419
-#: ../app/actions/edit-commands.c:439
+#: ../app/actions/edit-commands.c:390 ../app/actions/edit-commands.c:431
+#: ../app/actions/edit-commands.c:451
 msgid "Enter a name for this buffer"
 msgstr "このバッファーに付ける名前を入力してください"
 
-#: ../app/actions/edit-commands.c:416
+#: ../app/actions/edit-commands.c:428
 msgid "Copy Named"
 msgstr "名前を付けてコピー"
 
-#: ../app/actions/edit-commands.c:436
+#: ../app/actions/edit-commands.c:448
 msgid "Copy Visible Named "
 msgstr "可視部分に名前を付けてコピー"
 
-#: ../app/actions/edit-commands.c:561
+#: ../app/actions/edit-commands.c:573
 msgid "There is no active layer or channel to cut from."
 msgstr "切り取り元のアクティブなレイヤーがありません。"
 
-#: ../app/actions/edit-commands.c:566 ../app/actions/edit-commands.c:598
-#: ../app/actions/edit-commands.c:622
+#: ../app/actions/edit-commands.c:578 ../app/actions/edit-commands.c:610
+#: ../app/actions/edit-commands.c:634
 msgid "(Unnamed Buffer)"
 msgstr "(名称未設定のバッファー)"
 
-#: ../app/actions/edit-commands.c:593
+#: ../app/actions/edit-commands.c:605
 msgid "There is no active layer or channel to copy from."
 msgstr "コピー元のアクティブなレイヤーがありません。"
 
-#: ../app/actions/error-console-actions.c:39
+#: ../app/actions/error-console-actions.c:40
 msgctxt "error-console-action"
 msgid "Error Console Menu"
 msgstr "エラーコンソールのメニュー"
 
-#: ../app/actions/error-console-actions.c:43
+#: ../app/actions/error-console-actions.c:44
 msgctxt "error-console-action"
 msgid "_Clear"
 msgstr "消去(_C)"
 
-#: ../app/actions/error-console-actions.c:44
+#: ../app/actions/error-console-actions.c:45
 msgctxt "error-console-action"
 msgid "Clear error console"
 msgstr "すべてのエラーメッセージを消去します"
 
-#: ../app/actions/error-console-actions.c:49
+#: ../app/actions/error-console-actions.c:50
 msgctxt "error-console-action"
 msgid "Select _All"
 msgstr "すべて選択(_A)"
 
-#: ../app/actions/error-console-actions.c:50
+#: ../app/actions/error-console-actions.c:51
 msgctxt "error-console-action"
 msgid "Select all error messages"
 msgstr "すべてのエラーメッセージを選択します"
 
-#: ../app/actions/error-console-actions.c:58
+#: ../app/actions/error-console-actions.c:59
 msgctxt "error-console-action"
 msgid "_Save Error Log to File..."
 msgstr "エラーログの保存(_S)..."
 
-#: ../app/actions/error-console-actions.c:59
+#: ../app/actions/error-console-actions.c:60
 msgctxt "error-console-action"
 msgid "Write all error messages to a file"
 msgstr "すべてのエラーメッセージをエラーログとして保存します"
 
-#: ../app/actions/error-console-actions.c:64
+#: ../app/actions/error-console-actions.c:65
 msgctxt "error-console-action"
 msgid "Save S_election to File..."
 msgstr "エラーログを選択して保存(_E)..."
 
-#: ../app/actions/error-console-actions.c:65
+#: ../app/actions/error-console-actions.c:66
 msgctxt "error-console-action"
 msgid "Write the selected error messages to a file"
 msgstr "選択したエラーメッセージをエラーログとして保存します"
 
-#: ../app/actions/error-console-commands.c:84
+#: ../app/actions/error-console-commands.c:85
 msgid "Cannot save. Nothing is selected."
 msgstr "何も選択されていないので保存できません"
 
-#: ../app/actions/error-console-commands.c:95
+#: ../app/actions/error-console-commands.c:96
 msgid "Save Error Log to File"
 msgstr "エラーログの保存"
 
-#: ../app/actions/error-console-commands.c:157
+#: ../app/actions/error-console-commands.c:158
 #, c-format
 msgid ""
 "Error writing file '%s':\n"
@@ -2511,36 +2504,37 @@ msgstr "%s に上書きエクスポート(_W)"
 msgid "Export to"
 msgstr "元ファイルにエクスポート"
 
-#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:492
-#: ../app/dialogs/file-open-dialog.c:77
+#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:496
+#: ../app/dialogs/file-open-dialog.c:75
 msgid "Open Image"
 msgstr "画像ファイルを開く"
 
-#: ../app/actions/file-commands.c:133
+#: ../app/actions/file-commands.c:140
 msgid "Open Image as Layers"
 msgstr "レイヤーとして画像ファイルを開く"
 
-#: ../app/actions/file-commands.c:265
+#: ../app/actions/file-commands.c:272
 msgid "No changes need to be saved"
 msgstr "保存が必要な変更はありません"
 
-#: ../app/actions/file-commands.c:272 ../app/dialogs/file-save-dialog.c:95
+#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:703
+#: ../app/dialogs/file-save-dialog.c:103
 msgid "Save Image"
 msgstr "画像の保存"
 
-#: ../app/actions/file-commands.c:278
+#: ../app/actions/file-commands.c:285
 msgid "Save a Copy of the Image"
 msgstr "画像のコピーを保存"
 
-#: ../app/actions/file-commands.c:356
+#: ../app/actions/file-commands.c:370
 msgid "Create New Template"
 msgstr "新しいテンプレートを作成"
 
-#: ../app/actions/file-commands.c:360
+#: ../app/actions/file-commands.c:374
 msgid "Enter a name for this template"
 msgstr "このテンプレートに付ける名前を入力してください"
 
-#: ../app/actions/file-commands.c:394
+#: ../app/actions/file-commands.c:404
 msgid "Revert failed. No file name associated with this image."
 msgstr ""
 "復帰に失敗しました。\n"
@@ -2548,16 +2542,16 @@ msgstr ""
 
 # 復帰ダイアログのタイトル
 # GTK+ では、"Revert" は「元に戻す」と訳されている(ボタンの表記)ため「(画像を元に戻す)」を追記した
-#: ../app/actions/file-commands.c:407
+#: ../app/actions/file-commands.c:416
 msgid "Revert Image"
 msgstr "復帰 (画像を元に戻す)"
 
-#: ../app/actions/file-commands.c:438
+#: ../app/actions/file-commands.c:442
 #, c-format
 msgid "Revert '%s' to '%s'?"
 msgstr "編集中の画像 '%s' を画像ファイル '%s' の状態に戻しますか?"
 
-#: ../app/actions/file-commands.c:444
+#: ../app/actions/file-commands.c:448
 msgid ""
 "By reverting the image to the state saved on disk, you will lose all "
 "changes, including all undo information."
@@ -2565,11 +2559,11 @@ msgstr ""
 "画像をディスク上の画像ファイルの状態に戻します。\n"
 "作業履歴と保存していなかった変更はすべて破棄されます。"
 
-#: ../app/actions/file-commands.c:655
+#: ../app/actions/file-commands.c:733
 msgid "(Unnamed Template)"
 msgstr "(名称未設定のテンプレート)"
 
-#: ../app/actions/file-commands.c:706
+#: ../app/actions/file-commands.c:784
 #, c-format
 msgid ""
 "Reverting to '%s' failed:\n"
@@ -2579,83 +2573,321 @@ msgstr ""
 "'%s' の復帰に失敗しました。\n"
 "%s"
 
-#: ../app/actions/filters-actions.c:43
+#: ../app/actions/filters-actions.c:44
+msgctxt "filters-action"
+msgid "_Alien Map..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:49
 #, fuzzy
+#| msgid "_Antialiasing"
 msgctxt "filters-action"
-msgid "Color T_emperature..."
-msgstr "テンプレートの作成..."
+msgid "_Antialias..."
+msgstr "アンチエイリアス(_A)"
 
-#: ../app/actions/filters-actions.c:44
+#: ../app/actions/filters-actions.c:54
+msgctxt "filters-action"
+msgid "_Bump Map..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:59
 #, fuzzy
+#| msgid "Color _Balance..."
 msgctxt "filters-action"
-msgid "Change the color temperature of the image"
-msgstr "画像を拡大または縮小します。画像内容も拡大または縮小されます。"
+msgid "Color to Gray..."
+msgstr "カラーバランス(_B)..."
 
-#: ../app/actions/filters-actions.c:49
+#: ../app/actions/filters-actions.c:64
+msgctxt "filters-action"
+msgid "Ca_rtoon..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:69
+#, fuzzy
+#| msgctxt "channels-action"
+#| msgid "_New Channel..."
+msgctxt "filters-action"
+msgid "_Channel Mixer..."
+msgstr "チャンネルの追加(_N)..."
+
+#: ../app/actions/filters-actions.c:74
+msgctxt "filters-action"
+msgid "_Checkerboard..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:79
+#, fuzzy
+#| msgid "Colori_ze..."
+msgctxt "filters-action"
+msgid "Color _Reduction..."
+msgstr "着色(_Z)..."
+
+#: ../app/actions/filters-actions.c:84
+#, fuzzy
+#| msgctxt "file-action"
+#| msgid "Create Template..."
+msgctxt "filters-action"
+msgid "Color T_emperature..."
+msgstr "テンプレートの作成..."
+
+#: ../app/actions/filters-actions.c:89
 #, fuzzy
+#| msgid "Color _Balance..."
 msgctxt "filters-action"
 msgid "Color to _Alpha..."
 msgstr "カラーバランス(_B)..."
 
-#: ../app/actions/filters-actions.c:50
+#: ../app/actions/filters-actions.c:94
+msgctxt "filters-action"
+msgid "_Cubism..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:99
+#, fuzzy
+#| msgid "_Desaturate..."
+msgctxt "filters-action"
+msgid "_Deinterlace..."
+msgstr "脱色(_D)..."
+
+#: ../app/actions/filters-actions.c:104
+msgctxt "filters-action"
+msgid "Difference of Gaussians..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:109
+#, fuzzy
+#| msgctxt "select-action"
+#| msgid "_Grow..."
+msgctxt "filters-action"
+msgid "_Drop Shadow..."
+msgstr "選択範囲の拡大(_G)..."
+
+#: ../app/actions/filters-actions.c:114
+#, fuzzy
+#| msgid "_Replace"
+msgctxt "filters-action"
+msgid "_Laplace"
+msgstr "置換(_R)"
+
+#: ../app/actions/filters-actions.c:119
 msgctxt "filters-action"
-msgid "Convert a specified color to transparency"
+msgid "_Sobel..."
 msgstr ""
 
-#: ../app/actions/filters-actions.c:55
+#: ../app/actions/filters-actions.c:124
+msgctxt "filters-action"
+msgid "_Emboss..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:129
+#, fuzzy
+#| msgid "Exposure"
+msgctxt "filters-action"
+msgid "_E_xposure..."
+msgstr "露出"
+
+#: ../app/actions/filters-actions.c:134
+#, fuzzy
+#| msgctxt "image-action"
+#| msgid "_Scale Image..."
+msgctxt "filters-action"
+msgid "_Fractal Trace..."
+msgstr "画像の拡大・縮小(_S)..."
+
+#: ../app/actions/filters-actions.c:139
 msgctxt "filters-action"
 msgid "_Gaussian Blur..."
 msgstr ""
 
-#: ../app/actions/filters-actions.c:56
+#: ../app/actions/filters-actions.c:144
+#, fuzzy
+#| msgid "Grid"
+msgctxt "filters-action"
+msgid "_Grid..."
+msgstr "グリッド"
+
+#: ../app/actions/filters-actions.c:149
+#, fuzzy
+#| msgctxt "file-action"
+#| msgid "Open _Location..."
+msgctxt "filters-action"
+msgid "Lens Distortion..."
+msgstr "場所を開く(_L)..."
+
+#: ../app/actions/filters-actions.c:154
+msgctxt "filters-action"
+msgid "Mono Mixer..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:159
+msgctxt "filters-action"
+msgid "_Mosaic..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:164
+#, fuzzy
+#| msgctxt "tools-action"
+#| msgid "_Arbitrary Rotation..."
+msgctxt "filters-action"
+msgid "_Circular Motion Blur..."
+msgstr "任意の回転(_A)..."
+
+#: ../app/actions/filters-actions.c:169
+msgctxt "filters-action"
+msgid "_Linear Motion Blur..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:174
+msgctxt "filters-action"
+msgid "_Zoom Motion Blur..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:179
+msgctxt "filters-action"
+msgid "CIE lch Noise..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:184
+msgctxt "filters-action"
+msgid "HSV Noise..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:189
+msgctxt "filters-action"
+msgid "_Hurl..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:194
+#, fuzzy
+#| msgctxt "select-action"
+#| msgid "S_hrink..."
+msgctxt "filters-action"
+msgid "_Pick..."
+msgstr "選択範囲の縮小(_H)..."
+
+#: ../app/actions/filters-actions.c:199
+#, fuzzy
+#| msgctxt "plug-in-action"
+#| msgid "_Noise"
+msgctxt "filters-action"
+msgid "_RGB Noise..."
+msgstr "ノイズ(_N)"
+
+#: ../app/actions/filters-actions.c:204
+#, fuzzy
+#| msgctxt "layers-action"
+#| msgid "_Scale Layer..."
+msgctxt "filters-action"
+msgid "_Slur..."
+msgstr "レイヤーの拡大・縮小(_S)..."
+
+#: ../app/actions/filters-actions.c:209
+#, fuzzy
+#| msgid "_Threshold..."
+msgctxt "filters-action"
+msgid "Sp_read..."
+msgstr "しきい値(_T)..."
+
+#: ../app/actions/filters-actions.c:214
 msgctxt "filters-action"
-msgid "Apply a gaussian blur"
+msgid "_Photocopy..."
 msgstr ""
 
-#: ../app/actions/filters-actions.c:61
+#: ../app/actions/filters-actions.c:219
 #, fuzzy
+#| msgid "_Posterize..."
 msgctxt "filters-action"
 msgid "_Pixelize..."
 msgstr "ポスタリゼーション(_P)..."
 
-#: ../app/actions/filters-actions.c:62
+#: ../app/actions/filters-actions.c:224
 msgctxt "filters-action"
-msgid "Simplify image into an array of solid-colored squares"
+msgid "_Plasma..."
 msgstr ""
 
-#: ../app/actions/filters-actions.c:67
+#: ../app/actions/filters-actions.c:229
 msgctxt "filters-action"
 msgid "P_olar Coordinates..."
 msgstr ""
 
-#: ../app/actions/filters-actions.c:68
-#, fuzzy
+#: ../app/actions/filters-actions.c:234
 msgctxt "filters-action"
-msgid "Convert image to or from polar coordinates"
-msgstr "画像をグレースケールに変換"
+msgid "_Red Eye Removal..."
+msgstr ""
 
-#: ../app/actions/filters-actions.c:73
+#: ../app/actions/filters-actions.c:239
+msgctxt "filters-action"
+msgid "_Ripple..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:244
 #, fuzzy
+#| msgctxt "patterns-action"
+#| msgid "_Edit Pattern..."
 msgctxt "filters-action"
 msgid "_Semi-Flatten..."
 msgstr "パターンの編集(_E)..."
 
-#: ../app/actions/filters-actions.c:74
+#: ../app/actions/filters-actions.c:249
+#, fuzzy
+#| msgctxt "drawable-action"
+#| msgid "_Offset..."
 msgctxt "filters-action"
-msgid "Replace partial transparency with a color"
+msgid "_Shift..."
+msgstr "オフセット(_O)..."
+
+#: ../app/actions/filters-actions.c:254
+msgctxt "filters-action"
+msgid "_Softglow..."
 msgstr ""
 
-#: ../app/actions/filters-actions.c:79
+#: ../app/actions/filters-actions.c:259
+#, fuzzy
+#| msgid "B_rightness-Contrast..."
+msgctxt "filters-action"
+msgid "_Stretch Contrast..."
+msgstr "明るさ-コントラスト(_R)..."
+
+#: ../app/actions/filters-actions.c:264
 #, fuzzy
+#| msgid "_Threshold..."
 msgctxt "filters-action"
 msgid "_Threshold Alpha..."
 msgstr "しきい値(_T)..."
 
-#: ../app/actions/filters-actions.c:80
+#: ../app/actions/filters-actions.c:269
+msgctxt "filters-action"
+msgid "_Tile Seamless..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:274
+msgctxt "filters-action"
+msgid "_Unsharp Mask..."
+msgstr ""
+
+#: ../app/actions/filters-actions.c:279
 #, fuzzy
+#| msgctxt "palettes-action"
+#| msgid "_Edit Palette..."
 msgctxt "filters-action"
-msgid "Make transparency all-or-nothing"
-msgstr "透明にする(_T)"
+msgid "_Vignette..."
+msgstr "パレットの編集(_E)..."
+
+#: ../app/actions/filters-actions.c:284
+#, fuzzy
+#| msgid "_Curves..."
+msgctxt "filters-action"
+msgid "_Waves..."
+msgstr "トーンカーブ(_C)..."
+
+#: ../app/actions/filters-actions.c:289
+msgctxt "filters-action"
+msgid "W_hirl and Pinch..."
+msgstr ""
+
+#: ../app/actions/filters-commands.c:75
+msgid "..."
+msgstr ""
 
 #: ../app/actions/fonts-actions.c:44
 msgctxt "fonts-action"
@@ -3111,22 +3343,22 @@ msgstr "グラデーションエディターで編集します"
 msgid "Save '%s' as POV-Ray"
 msgstr "'%s' をPOV-Ray 形式で保存"
 
-#: ../app/actions/help-actions.c:37 ../app/actions/help-actions.c:40
+#: ../app/actions/help-actions.c:38 ../app/actions/help-actions.c:41
 msgctxt "help-action"
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../app/actions/help-actions.c:41
+#: ../app/actions/help-actions.c:42
 msgctxt "help-action"
 msgid "Open the GIMP user manual"
 msgstr "ヘルプ (GIMP 使用の手引き) を開きます"
 
-#: ../app/actions/help-actions.c:46
+#: ../app/actions/help-actions.c:47
 msgctxt "help-action"
 msgid "_Context Help"
 msgstr "状況適応ヘルプ(_C)"
 
-#: ../app/actions/help-actions.c:47
+#: ../app/actions/help-actions.c:48
 msgctxt "help-action"
 msgid "Show the help for a specific user interface item"
 msgstr "指定したアイテムについてのヘルプを表示します"
@@ -3148,6 +3380,7 @@ msgstr "モード(_M)"
 
 #: ../app/actions/image-actions.c:57
 #, fuzzy
+#| msgid "_Previous Tip"
 msgctxt "image-action"
 msgid "_Precision"
 msgstr "前の技(_P)"
@@ -3187,309 +3420,412 @@ msgctxt "image-action"
 msgid "C_omponents"
 msgstr "色要素(_O)"
 
-#: ../app/actions/image-actions.c:68
+#: ../app/actions/image-actions.c:66
+#, fuzzy
+#| msgid "Desaturate"
+msgctxt "image-action"
+msgid "D_esaturate"
+msgstr "脱色"
+
+#: ../app/actions/image-actions.c:69
 msgctxt "image-action"
 msgid "_New..."
 msgstr "新しい画像(_N)..."
 
-#: ../app/actions/image-actions.c:69
+#: ../app/actions/image-actions.c:70
 msgctxt "image-action"
 msgid "Create a new image"
 msgstr "新しい画像をダイアログで設定し、画像ウィンドウに表示します"
 
-#: ../app/actions/image-actions.c:74
+#: ../app/actions/image-actions.c:75
 msgctxt "image-action"
 msgid "Can_vas Size..."
 msgstr "キャンバスサイズの変更(_V)..."
 
-#: ../app/actions/image-actions.c:75
+#: ../app/actions/image-actions.c:76
 msgctxt "image-action"
 msgid "Adjust the image dimensions"
 msgstr "キャンバスサイズを変更します"
 
-#: ../app/actions/image-actions.c:80
+#: ../app/actions/image-actions.c:81
 msgctxt "image-action"
 msgid "Fit Canvas to L_ayers"
 msgstr "キャンバスをレイヤーに合わせる(_A)"
 
-#: ../app/actions/image-actions.c:81
+#: ../app/actions/image-actions.c:82
 msgctxt "image-action"
 msgid "Resize the image to enclose all layers"
 msgstr "すべてのレイヤーを内包するようにキャンバスサイズを変更します。"
 
-#: ../app/actions/image-actions.c:86
+#: ../app/actions/image-actions.c:87
 msgctxt "image-action"
 msgid "F_it Canvas to Selection"
 msgstr "キャンバスを選択範囲に合わせる(_I)"
 
-#: ../app/actions/image-actions.c:87
+#: ../app/actions/image-actions.c:88
 msgctxt "image-action"
 msgid "Resize the image to the extents of the selection"
 msgstr "キャンバスサイズを選択範囲の大きさに変更します"
 
-#: ../app/actions/image-actions.c:92
+#: ../app/actions/image-actions.c:93
 msgctxt "image-action"
 msgid "_Print Size..."
 msgstr "印刷サイズ(_P)..."
 
-#: ../app/actions/image-actions.c:93
+#: ../app/actions/image-actions.c:94
 msgctxt "image-action"
 msgid "Adjust the print resolution"
 msgstr "印刷サイズや解像度を調整します"
 
-#: ../app/actions/image-actions.c:98
+#: ../app/actions/image-actions.c:99
 msgctxt "image-action"
 msgid "_Scale Image..."
 msgstr "画像の拡大・縮小(_S)..."
 
-#: ../app/actions/image-actions.c:99
+#: ../app/actions/image-actions.c:100
 msgctxt "image-action"
 msgid "Change the size of the image content"
 msgstr "画像を拡大または縮小します。画像内容も拡大または縮小されます。"
 
-#: ../app/actions/image-actions.c:104
+#: ../app/actions/image-actions.c:105
 msgctxt "image-action"
 msgid "_Crop to Selection"
 msgstr "選択範囲で切り抜き(_C)"
 
-#: ../app/actions/image-actions.c:105
+#: ../app/actions/image-actions.c:106
 msgctxt "image-action"
 msgid "Crop the image to the extents of the selection"
 msgstr "選択範囲の大きさで画像を切り抜きます"
 
-#: ../app/actions/image-actions.c:110
+#: ../app/actions/image-actions.c:111
+msgctxt "image-action"
+msgid "Crop to C_ontent"
+msgstr ""
+
+#: ../app/actions/image-actions.c:112
+#, fuzzy
+#| msgctxt "image-action"
+#| msgid "Crop the image to the extents of the selection"
+msgctxt "image-action"
+msgid ""
+"Crop the image to the extents of its content (remove empty borders from the "
+"image)"
+msgstr "選択範囲の大きさで画像を切り抜きます"
+
+#: ../app/actions/image-actions.c:117
 msgctxt "image-action"
 msgid "_Duplicate"
 msgstr "複製(_D)"
 
-#: ../app/actions/image-actions.c:111
+#: ../app/actions/image-actions.c:118
 msgctxt "image-action"
 msgid "Create a duplicate of this image"
 msgstr "この画像の複製を作成します"
 
-#: ../app/actions/image-actions.c:116
+#: ../app/actions/image-actions.c:123
 msgctxt "image-action"
 msgid "Merge Visible _Layers..."
 msgstr "可視レイヤーの統合(_L)..."
 
-#: ../app/actions/image-actions.c:117
+#: ../app/actions/image-actions.c:124
 msgctxt "image-action"
 msgid "Merge all visible layers into one layer"
 msgstr "すべての可視レイヤーを1枚のレイヤーに統合します"
 
-#: ../app/actions/image-actions.c:122
+#: ../app/actions/image-actions.c:129
 msgctxt "image-action"
 msgid "_Flatten Image"
 msgstr "画像の統合(_F)"
 
-#: ../app/actions/image-actions.c:123
+#: ../app/actions/image-actions.c:130
 msgctxt "image-action"
 msgid "Merge all layers into one and remove transparency"
 msgstr "すべてのレイヤーを統合し、アルファチャンネルを削除します"
 
-#: ../app/actions/image-actions.c:128
+#: ../app/actions/image-actions.c:135
 msgctxt "image-action"
 msgid "Configure G_rid..."
 msgstr "グリッドの設定(_R)..."
 
-#: ../app/actions/image-actions.c:129
+#: ../app/actions/image-actions.c:136
 msgctxt "image-action"
 msgid "Configure the grid for this image"
 msgstr "この画像のグリッドを設定します"
 
-#: ../app/actions/image-actions.c:134
+#: ../app/actions/image-actions.c:141
 msgctxt "image-action"
 msgid "Image Pr_operties"
 msgstr "画像の情報(_O)"
 
-#: ../app/actions/image-actions.c:135
+#: ../app/actions/image-actions.c:142
 msgctxt "image-action"
 msgid "Display information about this image"
 msgstr "この画像の情報を表示します"
 
-#: ../app/actions/image-actions.c:143
+#: ../app/actions/image-actions.c:150
 msgctxt "image-convert-action"
 msgid "_RGB"
 msgstr "RGB(_R)"
 
-#: ../app/actions/image-actions.c:144
+#: ../app/actions/image-actions.c:151
 msgctxt "image-convert-action"
 msgid "Convert the image to the RGB colorspace"
 msgstr "画像を RGB カラースペースに変換します"
 
-#: ../app/actions/image-actions.c:148
+#: ../app/actions/image-actions.c:155
 msgctxt "image-convert-action"
 msgid "_Grayscale"
 msgstr "グレースケール(_G)"
 
-#: ../app/actions/image-actions.c:149
+#: ../app/actions/image-actions.c:156
 msgctxt "image-convert-action"
 msgid "Convert the image to grayscale"
 msgstr "画像をグレースケールに変換します"
 
-#: ../app/actions/image-actions.c:153
+#: ../app/actions/image-actions.c:160
 msgctxt "image-convert-action"
 msgid "_Indexed..."
 msgstr "インデックス(_I)..."
 
-#: ../app/actions/image-actions.c:154
+#: ../app/actions/image-actions.c:161
 msgctxt "image-convert-action"
 msgid "Convert the image to indexed colors"
 msgstr "画像をインデックスカラーに変換します"
 
-#: ../app/actions/image-actions.c:161
+#: ../app/actions/image-actions.c:168
+msgctxt "image-convert-action"
+msgid "8 bit integer (linear)"
+msgstr ""
+
+#: ../app/actions/image-actions.c:170
+#, fuzzy
+#| msgctxt "image-convert-action"
+#| msgid "Convert the image to indexed colors"
+msgctxt "image-convert-action"
+msgid "Convert the image to 8 bit linear integer"
+msgstr "画像をインデックスカラーに変換します"
+
+#: ../app/actions/image-actions.c:174
 msgctxt "image-convert-action"
-msgid "8 bit integer"
+msgid "8 bit integer (gamma)"
 msgstr ""
 
-#: ../app/actions/image-actions.c:162
+#: ../app/actions/image-actions.c:176
 #, fuzzy
+#| msgctxt "image-convert-action"
+#| msgid "Convert the image to indexed colors"
 msgctxt "image-convert-action"
-msgid "Convert the image to 8 bit integer"
+msgid "Convert the image to 8 bit gamma-corrected integer"
 msgstr "画像をインデックスカラーに変換します"
 
-#: ../app/actions/image-actions.c:166
+#: ../app/actions/image-actions.c:180
 msgctxt "image-convert-action"
-msgid "16 bit integer"
+msgid "16 bit integer (linear)"
 msgstr ""
 
-#: ../app/actions/image-actions.c:167
+#: ../app/actions/image-actions.c:182
 #, fuzzy
+#| msgctxt "image-convert-action"
+#| msgid "Convert the image to indexed colors"
 msgctxt "image-convert-action"
-msgid "Convert the image to 16 bit integer"
+msgid "Convert the image to 16 bit linear integer"
 msgstr "画像をインデックスカラーに変換します"
 
-#: ../app/actions/image-actions.c:171
+#: ../app/actions/image-actions.c:186
 msgctxt "image-convert-action"
-msgid "32 bit integer"
+msgid "16 bit integer (gamma)"
 msgstr ""
 
-#: ../app/actions/image-actions.c:172
+#: ../app/actions/image-actions.c:188
 #, fuzzy
+#| msgctxt "image-convert-action"
+#| msgid "Convert the image to indexed colors"
 msgctxt "image-convert-action"
-msgid "Convert the image to 32 bit integer"
+msgid "Convert the image to 16 bit gamma-corrected integer"
 msgstr "画像をインデックスカラーに変換します"
 
-#: ../app/actions/image-actions.c:176
+#: ../app/actions/image-actions.c:192
 msgctxt "image-convert-action"
-msgid "16 bit floating point"
+msgid "32 bit integer (linear)"
 msgstr ""
 
-#: ../app/actions/image-actions.c:177
+#: ../app/actions/image-actions.c:194
 #, fuzzy
+#| msgctxt "image-convert-action"
+#| msgid "Convert the image to indexed colors"
 msgctxt "image-convert-action"
-msgid "Convert the image to 16 bit floating point"
+msgid "Convert the image to 32 bit linear integer"
 msgstr "画像をインデックスカラーに変換します"
 
-#: ../app/actions/image-actions.c:181
+#: ../app/actions/image-actions.c:198
 msgctxt "image-convert-action"
-msgid "32 bit floating point"
+msgid "32 bit integer (gamma)"
 msgstr ""
 
-#: ../app/actions/image-actions.c:182
+#: ../app/actions/image-actions.c:200
+#, fuzzy
+#| msgctxt "image-convert-action"
+#| msgid "Convert the image to indexed colors"
+msgctxt "image-convert-action"
+msgid "Convert the image to 32 bit gamma-corrected integer"
+msgstr "画像をインデックスカラーに変換します"
+
+#: ../app/actions/image-actions.c:204
+msgctxt "image-convert-action"
+msgid "16 bit floating point (linear)"
+msgstr ""
+
+#: ../app/actions/image-actions.c:206
+#, fuzzy
+#| msgctxt "image-convert-action"
+#| msgid "Convert the image to indexed colors"
+msgctxt "image-convert-action"
+msgid "Convert the image to 16 bit linear floating point"
+msgstr "画像をインデックスカラーに変換します"
+
+#: ../app/actions/image-actions.c:210
+msgctxt "image-convert-action"
+msgid "16 bit floating point (gamma)"
+msgstr ""
+
+#: ../app/actions/image-actions.c:212
+#, fuzzy
+#| msgctxt "image-convert-action"
+#| msgid "Convert the image to indexed colors"
+msgctxt "image-convert-action"
+msgid "Convert the image to 16 bit gamma-corrected floating point"
+msgstr "画像をインデックスカラーに変換します"
+
+#: ../app/actions/image-actions.c:216
+msgctxt "image-convert-action"
+msgid "32 bit floating point (linear)"
+msgstr ""
+
+#: ../app/actions/image-actions.c:218
+#, fuzzy
+#| msgctxt "image-convert-action"
+#| msgid "Convert the image to indexed colors"
+msgctxt "image-convert-action"
+msgid "Convert the image to 32 bit linear floating point"
+msgstr "画像をインデックスカラーに変換します"
+
+#: ../app/actions/image-actions.c:222
+msgctxt "image-convert-action"
+msgid "32 bit floating point (gamma)"
+msgstr ""
+
+#: ../app/actions/image-actions.c:224
 #, fuzzy
+#| msgctxt "image-convert-action"
+#| msgid "Convert the image to indexed colors"
 msgctxt "image-convert-action"
-msgid "Convert the image to 32 bit floating point"
+msgid "Convert the image to 32 bit gamma-corrected floating point"
 msgstr "画像をインデックスカラーに変換します"
 
-#: ../app/actions/image-actions.c:189
+#: ../app/actions/image-actions.c:231
 msgctxt "image-action"
 msgid "Flip _Horizontally"
 msgstr "水平反転(_H)"
 
-#: ../app/actions/image-actions.c:190
+#: ../app/actions/image-actions.c:232
 msgctxt "image-action"
 msgid "Flip image horizontally"
 msgstr "画像の左右を反転します (すべてのレイヤーが反転します)"
 
-#: ../app/actions/image-actions.c:195
+#: ../app/actions/image-actions.c:237
 msgctxt "image-action"
 msgid "Flip _Vertically"
 msgstr "垂直反転(_V)"
 
-#: ../app/actions/image-actions.c:196
+#: ../app/actions/image-actions.c:238
 msgctxt "image-action"
 msgid "Flip image vertically"
 msgstr "画像の上下を反転します (すべてのレイヤーが反転します)"
 
-#: ../app/actions/image-actions.c:204
+#: ../app/actions/image-actions.c:246
 msgctxt "image-action"
 msgid "Rotate 90° _clockwise"
 msgstr "時計回りに 90 度回転(_C)"
 
-#: ../app/actions/image-actions.c:205
+#: ../app/actions/image-actions.c:247
 msgctxt "image-action"
 msgid "Rotate the image 90 degrees to the right"
 msgstr "画像を右 (時計回り) に 90 度回転します (すべてのレイヤーが回転します)"
 
-#: ../app/actions/image-actions.c:210
+#: ../app/actions/image-actions.c:252
 msgctxt "image-action"
 msgid "Rotate _180°"
 msgstr "180 度回転(_1)"
 
-#: ../app/actions/image-actions.c:211
+#: ../app/actions/image-actions.c:253
 msgctxt "image-action"
 msgid "Turn the image upside-down"
 msgstr "画像を 180 度回転します(すべてのレイヤーが回転します)"
 
-#: ../app/actions/image-actions.c:216
+#: ../app/actions/image-actions.c:258
 msgctxt "image-action"
 msgid "Rotate 90° counter-clock_wise"
-msgstr "反時計回りに 90 度回転(_w)"
+msgstr "反時計回りに 90 度回転(_W)"
 
-#: ../app/actions/image-actions.c:217
+#: ../app/actions/image-actions.c:259
 msgctxt "image-action"
 msgid "Rotate the image 90 degrees to the left"
 msgstr "画像を反時計回りに 90 度回転します (すべてのレイヤーが回転します)"
 
-#: ../app/actions/image-commands.c:258
+#: ../app/actions/image-commands.c:309
 msgid "Set Image Canvas Size"
 msgstr "キャンバスサイズの変更"
 
-#: ../app/actions/image-commands.c:287 ../app/actions/image-commands.c:311
-#: ../app/actions/image-commands.c:604
+#: ../app/actions/image-commands.c:338 ../app/actions/image-commands.c:362
+#: ../app/actions/image-commands.c:694
 msgid "Resizing"
 msgstr "サイズ変更しています"
 
-#: ../app/actions/image-commands.c:338
+#: ../app/actions/image-commands.c:389
 msgid "Set Image Print Resolution"
 msgstr "画像印刷解像度の設定"
 
-#: ../app/actions/image-commands.c:400
-#: ../app/pdb/drawable-transform-cmds.c:163
-#: ../app/pdb/drawable-transform-cmds.c:251
-#: ../app/pdb/item-transform-cmds.c:166
+#: ../app/actions/image-commands.c:451
+#: ../app/pdb/drawable-transform-cmds.c:166
+#: ../app/pdb/drawable-transform-cmds.c:256
+#: ../app/pdb/item-transform-cmds.c:170
 msgid "Flipping"
 msgstr "反転しています"
 
-#: ../app/actions/image-commands.c:424
-#: ../app/pdb/drawable-transform-cmds.c:606
-#: ../app/pdb/drawable-transform-cmds.c:698 ../app/pdb/image-cmds.c:618
-#: ../app/pdb/item-transform-cmds.c:437 ../app/pdb/transform-tools-cmds.c:249
-#: ../app/tools/gimprotatetool.c:125
+#: ../app/actions/image-commands.c:475
+#: ../app/pdb/drawable-transform-cmds.c:617
+#: ../app/pdb/drawable-transform-cmds.c:711 ../app/pdb/image-cmds.c:620
+#: ../app/pdb/item-transform-cmds.c:443 ../app/pdb/transform-tools-cmds.c:255
+#: ../app/tools/gimprotatetool.c:126
 msgid "Rotating"
 msgstr "回転しています"
 
-#: ../app/actions/image-commands.c:450 ../app/actions/layers-commands.c:691
+#: ../app/actions/image-commands.c:501 ../app/actions/layers-commands.c:693
 msgid "Cannot crop because the current selection is empty."
 msgstr "何も選択されてないので切り抜けません。"
 
-#: ../app/actions/image-commands.c:651
+#: ../app/actions/image-commands.c:528
+#, fuzzy
+#| msgid "Cannot crop because the current selection is empty."
+msgid "Cannot crop because the image has no content."
+msgstr "何も選択されてないので切り抜けません。"
+
+#: ../app/actions/image-commands.c:742
 msgid "Change Print Size"
 msgstr "印刷サイズの変更"
 
-#: ../app/actions/image-commands.c:692
+#: ../app/actions/image-commands.c:783
 msgid "Scale Image"
 msgstr "画像の拡大・縮小"
 
 #. Scaling
-#: ../app/actions/image-commands.c:703 ../app/actions/layers-commands.c:1145
-#: ../app/dialogs/preferences-dialog.c:1900
-#: ../app/pdb/drawable-transform-cmds.c:787
-#: ../app/pdb/drawable-transform-cmds.c:876 ../app/pdb/image-cmds.c:490
-#: ../app/pdb/image-cmds.c:526 ../app/pdb/item-transform-cmds.c:528
-#: ../app/pdb/layer-cmds.c:343 ../app/pdb/layer-cmds.c:388
-#: ../app/pdb/transform-tools-cmds.c:338 ../app/tools/gimpscaletool.c:118
+#: ../app/actions/image-commands.c:794 ../app/actions/layers-commands.c:1181
+#: ../app/dialogs/preferences-dialog.c:1726
+#: ../app/pdb/drawable-transform-cmds.c:800
+#: ../app/pdb/drawable-transform-cmds.c:891 ../app/pdb/image-cmds.c:492
+#: ../app/pdb/image-cmds.c:528 ../app/pdb/item-transform-cmds.c:534
+#: ../app/pdb/layer-cmds.c:386 ../app/pdb/layer-cmds.c:433
+#: ../app/pdb/transform-tools-cmds.c:346 ../app/tools/gimpscaletool.c:119
 msgid "Scaling"
 msgstr "拡大または縮小"
 
@@ -3594,7 +3930,7 @@ msgctxt "layers-action"
 msgid "Edit the layer's name"
 msgstr "このレイヤーの名前を変更します"
 
-#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:610
+#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:618
 msgctxt "layers-action"
 msgid "_New Layer..."
 msgstr "新しいレイヤーの追加(_N)..."
@@ -3604,7 +3940,7 @@ msgctxt "layers-action"
 msgid "Create a new layer and add it to the image"
 msgstr "新しいレイヤーを画像に追加します"
 
-#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:611
+#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:619
 msgctxt "layers-action"
 msgid "_New Layer"
 msgstr "新しいレイヤーの追加(_N)"
@@ -3625,8 +3961,11 @@ msgid "Create a new layer from what is visible in this image"
 msgstr "この画像中に見えているものでレイヤーを生成し、画像に追加します"
 
 #: ../app/actions/layers-actions.c:101
+#, fuzzy
+#| msgctxt "layers-action"
+#| msgid "New Layer _Group..."
 msgctxt "layers-action"
-msgid "New Layer _Group..."
+msgid "New Layer _Group"
 msgstr "新しいレイヤーグループ(_G)..."
 
 #: ../app/actions/layers-actions.c:102
@@ -3821,197 +4160,212 @@ msgstr "選択範囲の大きさでレイヤーを切り抜きます"
 
 #: ../app/actions/layers-actions.c:216
 msgctxt "layers-action"
+msgid "Crop to C_ontent"
+msgstr ""
+
+#: ../app/actions/layers-actions.c:217
+#, fuzzy
+#| msgctxt "layers-action"
+#| msgid "Crop the layer to the extents of the selection"
+msgctxt "layers-action"
+msgid ""
+"Crop the layer to the extents of its content (remove empty borders from the "
+"layer)"
+msgstr "選択範囲の大きさでレイヤーを切り抜きます"
+
+#: ../app/actions/layers-actions.c:222
+msgctxt "layers-action"
 msgid "Add La_yer Mask..."
 msgstr "レイヤーマスクの追加(_Y)..."
 
-#: ../app/actions/layers-actions.c:218
+#: ../app/actions/layers-actions.c:224
 msgctxt "layers-action"
 msgid "Add a mask that allows non-destructive editing of transparency"
 msgstr ""
 "レイヤーのアルファチャンネルを擬似的に編集するマスクを追加します (レイヤー本"
 "来の透明度情報は損なわれません)"
 
-#: ../app/actions/layers-actions.c:223
+#: ../app/actions/layers-actions.c:229
 msgctxt "layers-action"
 msgid "Add Alpha C_hannel"
 msgstr "アルファチャンネルの追加(_H)"
 
-#: ../app/actions/layers-actions.c:224
+#: ../app/actions/layers-actions.c:230
 msgctxt "layers-action"
 msgid "Add transparency information to the layer"
 msgstr "レイヤーにアルファチャンネル (透明度情報) を追加します"
 
-#: ../app/actions/layers-actions.c:229
+#: ../app/actions/layers-actions.c:235
 msgctxt "layers-action"
 msgid "_Remove Alpha Channel"
 msgstr "アルファチャンネルの削除(_R)"
 
-#: ../app/actions/layers-actions.c:230
+#: ../app/actions/layers-actions.c:236
 msgctxt "layers-action"
 msgid "Remove transparency information from the layer"
 msgstr "レイヤーからアルファチャンネル (透明度情報) を削除します"
 
-#: ../app/actions/layers-actions.c:238
+#: ../app/actions/layers-actions.c:244
 msgctxt "layers-action"
 msgid "Lock Alph_a Channel"
 msgstr "透明部分の保護(_A)"
 
-#: ../app/actions/layers-actions.c:240
+#: ../app/actions/layers-actions.c:246
 msgctxt "layers-action"
 msgid "Keep transparency information on this layer from being modified"
 msgstr "レイヤー透明部分が変更されないように保護します"
 
-#: ../app/actions/layers-actions.c:246
+#: ../app/actions/layers-actions.c:252
 msgctxt "layers-action"
 msgid "_Edit Layer Mask"
 msgstr "レイヤーマスクの編集(_E)"
 
-#: ../app/actions/layers-actions.c:247
+#: ../app/actions/layers-actions.c:253
 msgctxt "layers-action"
 msgid "Work on the layer mask"
 msgstr "レイヤーマスクを編集対象にします"
 
-#: ../app/actions/layers-actions.c:253
+#: ../app/actions/layers-actions.c:259
 msgctxt "layers-action"
 msgid "S_how Layer Mask"
 msgstr "レイヤーマスクの表示(_H)"
 
-#: ../app/actions/layers-actions.c:259
+#: ../app/actions/layers-actions.c:265
 msgctxt "layers-action"
 msgid "_Disable Layer Mask"
 msgstr "レイヤーマスクの無効化(_D)"
 
-#: ../app/actions/layers-actions.c:260
+#: ../app/actions/layers-actions.c:266
 msgctxt "layers-action"
 msgid "Dismiss the effect of the layer mask"
 msgstr "レイヤーマスクの効果を無効にします"
 
-#: ../app/actions/layers-actions.c:269
+#: ../app/actions/layers-actions.c:275
 msgctxt "layers-action"
 msgid "Apply Layer _Mask"
 msgstr "レイヤーマスクの適用(_M)"
 
-#: ../app/actions/layers-actions.c:270
+#: ../app/actions/layers-actions.c:276
 msgctxt "layers-action"
 msgid "Apply the effect of the layer mask and remove it"
 msgstr "レイヤーマスクの効果を適用し、レイヤーマスクを削除します"
 
-#: ../app/actions/layers-actions.c:275
+#: ../app/actions/layers-actions.c:281
 msgctxt "layers-action"
 msgid "Delete Layer Mas_k"
 msgstr "レイヤーマスクの削除(_K)"
 
-#: ../app/actions/layers-actions.c:276
+#: ../app/actions/layers-actions.c:282
 msgctxt "layers-action"
 msgid "Remove the layer mask and its effect"
 msgstr "レイヤーマスクを削除します (効果は適用されません)"
 
-#: ../app/actions/layers-actions.c:284
+#: ../app/actions/layers-actions.c:290
 msgctxt "layers-action"
 msgid "_Mask to Selection"
 msgstr "マスクを選択範囲に(_M)"
 
-#: ../app/actions/layers-actions.c:285
+#: ../app/actions/layers-actions.c:291
 msgctxt "layers-action"
 msgid "Replace the selection with the layer mask"
 msgstr "レイヤーマスクから選択範囲を作成します"
 
-#: ../app/actions/layers-actions.c:290
+#: ../app/actions/layers-actions.c:296
 msgctxt "layers-action"
 msgid "_Add to Selection"
 msgstr "選択範囲に加える(_A)"
 
-#: ../app/actions/layers-actions.c:291
+#: ../app/actions/layers-actions.c:297
 msgctxt "layers-action"
 msgid "Add the layer mask to the current selection"
 msgstr "選択範囲にレイヤーマスクの範囲を加えます"
 
-#: ../app/actions/layers-actions.c:296 ../app/actions/layers-actions.c:325
+#: ../app/actions/layers-actions.c:302 ../app/actions/layers-actions.c:331
 msgctxt "layers-action"
 msgid "_Subtract from Selection"
 msgstr "選択範囲から引く(_S)"
 
-#: ../app/actions/layers-actions.c:297
+#: ../app/actions/layers-actions.c:303
 msgctxt "layers-action"
 msgid "Subtract the layer mask from the current selection"
 msgstr "選択範囲からレイヤーマスクの範囲を引きます"
 
-#: ../app/actions/layers-actions.c:302 ../app/actions/layers-actions.c:332
+#: ../app/actions/layers-actions.c:308 ../app/actions/layers-actions.c:338
 msgctxt "layers-action"
 msgid "_Intersect with Selection"
 msgstr "選択範囲との交わり(_I)"
 
-#: ../app/actions/layers-actions.c:303
+#: ../app/actions/layers-actions.c:309
 msgctxt "layers-action"
 msgid "Intersect the layer mask with the current selection"
 msgstr "選択範囲とレイヤーマスクの範囲との交差部分を新しい選択範囲にします"
 
-#: ../app/actions/layers-actions.c:311
+#: ../app/actions/layers-actions.c:317
 msgctxt "layers-action"
 msgid "Al_pha to Selection"
 msgstr "不透明部分を選択範囲に(_P)"
 
-#: ../app/actions/layers-actions.c:313
+#: ../app/actions/layers-actions.c:319
 msgctxt "layers-action"
 msgid "Replace the selection with the layer's alpha channel"
 msgstr "レイヤーの不透明部分で選択範囲を作成します"
 
-#: ../app/actions/layers-actions.c:318
+#: ../app/actions/layers-actions.c:324
 msgctxt "layers-action"
 msgid "A_dd to Selection"
 msgstr "選択範囲に加える(_D)"
 
-#: ../app/actions/layers-actions.c:320
+#: ../app/actions/layers-actions.c:326
 msgctxt "layers-action"
 msgid "Add the layer's alpha channel to the current selection"
 msgstr "選択範囲にレイヤー不透明部分の範囲を加えます"
 
-#: ../app/actions/layers-actions.c:327
+#: ../app/actions/layers-actions.c:333
 msgctxt "layers-action"
 msgid "Subtract the layer's alpha channel from the current selection"
 msgstr "選択範囲からレイヤー不透明部分の範囲を引きます"
 
-#: ../app/actions/layers-actions.c:334
+#: ../app/actions/layers-actions.c:340
 msgctxt "layers-action"
 msgid "Intersect the layer's alpha channel with the current selection"
 msgstr "選択範囲とレイヤー不透明部分の範囲との交差部分を新しい選択範囲にします"
 
-#: ../app/actions/layers-actions.c:342
+#: ../app/actions/layers-actions.c:348
 msgctxt "layers-action"
 msgid "Select _Top Layer"
 msgstr "最前面レイヤーの選択(_T)"
 
-#: ../app/actions/layers-actions.c:343
+#: ../app/actions/layers-actions.c:349
 msgctxt "layers-action"
 msgid "Select the topmost layer"
 msgstr "最前面のレイヤーをアクティブにします"
 
-#: ../app/actions/layers-actions.c:348
+#: ../app/actions/layers-actions.c:354
 msgctxt "layers-action"
 msgid "Select _Bottom Layer"
 msgstr "最背面レイヤーの選択(_B)"
 
-#: ../app/actions/layers-actions.c:349
+#: ../app/actions/layers-actions.c:355
 msgctxt "layers-action"
 msgid "Select the bottommost layer"
 msgstr "最背面のレイヤーをアクティブにします"
 
-#: ../app/actions/layers-actions.c:354
+#: ../app/actions/layers-actions.c:360
 msgctxt "layers-action"
 msgid "Select _Previous Layer"
 msgstr "前面レイヤーの選択(_P)"
 
-#: ../app/actions/layers-actions.c:355
+#: ../app/actions/layers-actions.c:361
 msgctxt "layers-action"
 msgid "Select the layer above the current layer"
 msgstr "前面のレイヤーをアクティブにします"
 
-#: ../app/actions/layers-actions.c:360
+#: ../app/actions/layers-actions.c:366
 msgctxt "layers-action"
 msgid "Select _Next Layer"
 msgstr "背面レイヤーの選択(_N)"
 
-#: ../app/actions/layers-actions.c:361
+#: ../app/actions/layers-actions.c:367
 msgctxt "layers-action"
 msgid "Select the layer below the current layer"
 msgstr "背面のレイヤーをアクティブにします"
@@ -4019,66 +4373,82 @@ msgstr "背面のレイヤーをアクティブにします"
 #. Will be followed with e.g. "Shift-Click
 #. on thumbnail"
 #.
-#: ../app/actions/layers-actions.c:442
+#: ../app/actions/layers-actions.c:448
 msgid "Shortcut: "
 msgstr "ショートカット: "
 
 #. Will be prepended with a modifier key
 #. string, e.g. "Shift"
 #.
-#: ../app/actions/layers-actions.c:447
+#: ../app/actions/layers-actions.c:453
 msgid "-Click on thumbnail in Layers dockable"
 msgstr " - クリック (レイヤーダイアログのサムネイル上で)"
 
-#: ../app/actions/layers-actions.c:605 ../app/actions/layers-actions.c:606
+#: ../app/actions/layers-actions.c:613 ../app/actions/layers-actions.c:614
 msgctxt "layers-action"
 msgid "To _New Layer"
 msgstr "新しいレイヤーの生成(_N)"
 
 # レイヤーの Attributes は今のところレイヤーの名前だけなので、ユーザの誤解を防ぐため、「レイヤー名の変更」にしている。
-#: ../app/actions/layers-commands.c:203
+#: ../app/actions/layers-commands.c:205
 msgid "Layer Attributes"
 msgstr "レイヤー名の変更"
 
-#: ../app/actions/layers-commands.c:206
+#: ../app/actions/layers-commands.c:208
 msgid "Edit Layer Attributes"
 msgstr "レイヤー名の変更"
 
-#: ../app/actions/layers-commands.c:250 ../app/core/gimplayer.c:290
+#: ../app/actions/layers-commands.c:252 ../app/core/gimplayer.c:301
 msgid "Layer"
 msgstr "レイヤー"
 
-#: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320
-#: ../app/widgets/gimpdrawabletreeview.c:318
-#: ../app/widgets/gimplayertreeview.c:837
+#: ../app/actions/layers-commands.c:254 ../app/actions/layers-commands.c:322
+#: ../app/widgets/gimpdrawabletreeview.c:319
+#: ../app/widgets/gimplayertreeview.c:839
 msgid "New Layer"
 msgstr "新しいレイヤー"
 
-#: ../app/actions/layers-commands.c:255
+#: ../app/actions/layers-commands.c:257
 msgid "Create a New Layer"
 msgstr "新しいレイヤーの追加"
 
-#: ../app/actions/layers-commands.c:356
+#: ../app/actions/layers-commands.c:358
 msgid "Visible"
 msgstr "可視部分コピー"
 
-#: ../app/actions/layers-commands.c:618
+#: ../app/actions/layers-commands.c:620
 msgid "Set Layer Boundary Size"
 msgstr "レイヤーサイズの変更"
 
-#: ../app/actions/layers-commands.c:663
+#: ../app/actions/layers-commands.c:665
 msgid "Scale Layer"
 msgstr "レイヤーの拡大・縮小"
 
-#: ../app/actions/layers-commands.c:701
-msgid "Crop Layer"
-msgstr "レイヤーの切り抜き"
+#: ../app/actions/layers-commands.c:703
+#, fuzzy
+#| msgctxt "image-action"
+#| msgid "_Crop to Selection"
+msgid "Crop Layer to Selection"
+msgstr "選択範囲で切り抜き(_C)"
+
+#: ../app/actions/layers-commands.c:732
+#, fuzzy
+#| msgid "Cannot crop because the current selection is empty."
+msgid "Cannot crop because the active layer has no content."
+msgstr "何も選択されてないので切り抜けません。"
+
+#: ../app/actions/layers-commands.c:737
+#, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Lower Layer to Bottom"
+msgid "Crop Layer to Content"
+msgstr "レイヤーを最背面へ"
 
-#: ../app/actions/layers-commands.c:1080
+#: ../app/actions/layers-commands.c:1116
 msgid "Please select a channel first"
 msgstr "最初にチャンネルを選択してください"
 
-#: ../app/actions/layers-commands.c:1088
+#: ../app/actions/layers-commands.c:1124
 #: ../app/dialogs/layer-add-mask-dialog.c:82
 msgid "Add Layer Mask"
 msgstr "レイヤーマスクを追加"
@@ -4520,17 +4890,17 @@ msgstr "クイックマスク表示色の設定"
 msgid "_Mask opacity:"
 msgstr "マスク不透明度(_M):"
 
-#: ../app/actions/sample-points-actions.c:39
+#: ../app/actions/sample-points-actions.c:40
 msgctxt "sample-points-action"
 msgid "Sample Point Menu"
 msgstr "サンプルポイントメニュー"
 
-#: ../app/actions/sample-points-actions.c:46
+#: ../app/actions/sample-points-actions.c:47
 msgctxt "sample-points-action"
 msgid "_Sample Merged"
 msgstr "見えている色の情報を表示(_S)"
 
-#: ../app/actions/sample-points-actions.c:48
+#: ../app/actions/sample-points-actions.c:49
 msgctxt "sample-points-action"
 msgid "Use the composite color of all visible layers"
 msgstr ""
@@ -4801,61 +5171,59 @@ msgid ""
 "Are you sure you want to delete template '%s' from the list and from disk?"
 msgstr "テンプレート '%s' を一覧とディスクから削除してよろしいですか?"
 
-#: ../app/actions/text-editor-actions.c:43
+#: ../app/actions/text-editor-actions.c:44
 msgctxt "text-editor-action"
 msgid "Open"
 msgstr "テキストを開く"
 
-#: ../app/actions/text-editor-actions.c:44
+#: ../app/actions/text-editor-actions.c:45
 msgctxt "text-editor-action"
 msgid "Load text from file"
 msgstr "ファイルからテキストを読み込みます"
 
-#: ../app/actions/text-editor-actions.c:49
+#: ../app/actions/text-editor-actions.c:50
 msgctxt "text-editor-action"
 msgid "Clear"
 msgstr "テキストを消去"
 
-#: ../app/actions/text-editor-actions.c:50
+#: ../app/actions/text-editor-actions.c:51
 msgctxt "text-editor-action"
 msgid "Clear all text"
 msgstr "すべてのテキストを消去します"
 
-#: ../app/actions/text-editor-actions.c:58
+#: ../app/actions/text-editor-actions.c:59
 msgctxt "text-editor-action"
 msgid "LTR"
 msgstr "LTR"
 
-#: ../app/actions/text-editor-actions.c:59
+#: ../app/actions/text-editor-actions.c:60
 msgctxt "text-editor-action"
 msgid "From left to right"
 msgstr "左から右へ"
 
-#: ../app/actions/text-editor-actions.c:64
+#: ../app/actions/text-editor-actions.c:65
 msgctxt "text-editor-action"
 msgid "RTL"
 msgstr "RTL"
 
-#: ../app/actions/text-editor-actions.c:65
+#: ../app/actions/text-editor-actions.c:66
 msgctxt "text-editor-action"
 msgid "From right to left"
 msgstr "右から左へ"
 
-#: ../app/actions/text-editor-commands.c:62
+#: ../app/actions/text-editor-commands.c:63
 #: ../app/actions/text-tool-commands.c:118
 msgid "Open Text File (UTF-8)"
 msgstr "テキストファイル (UTF-8) を開く"
 
-#: ../app/actions/text-editor-commands.c:143
-#: ../app/actions/text-tool-commands.c:227 ../app/config/gimpconfig-file.c:58
-#: ../app/core/gimpbrushgenerated-load.c:71 ../app/core/gimpbrush-load.c:139
-#: ../app/core/gimpbrush-load.c:424 ../app/core/gimpbrushpipe-load.c:79
-#: ../app/core/gimpcurve-load.c:54 ../app/core/gimpgradient-load.c:64
-#: ../app/core/gimppalette-load.c:78 ../app/core/gimppalette-load.c:275
-#: ../app/core/gimppalette-load.c:321 ../app/core/gimppalette-load.c:378
-#: ../app/core/gimppalette-load.c:468 ../app/core/gimppalette-load.c:635
-#: ../app/core/gimppattern-load.c:81 ../app/tools/gimpcurvestool.c:600
-#: ../app/tools/gimplevelstool.c:670 ../app/xcf/xcf.c:330
+#: ../app/actions/text-editor-commands.c:144
+#: ../app/actions/text-tool-commands.c:227 ../app/config/gimpconfig-file.c:71
+#: ../app/core/gimpbrushgenerated-load.c:72 ../app/core/gimpbrush-load.c:142
+#: ../app/core/gimpbrush-load.c:427 ../app/core/gimpbrushpipe-load.c:80
+#: ../app/core/gimpcurve-load.c:55 ../app/core/gimpgradient-load.c:64
+#: ../app/core/gimppalette-import.c:515 ../app/core/gimppalette-load.c:66
+#: ../app/core/gimppattern-load.c:81 ../app/tools/gimpcurvestool.c:609
+#: ../app/tools/gimplevelstool.c:632
 #, c-format
 msgid "Could not open '%s' for reading: %s"
 msgstr ""
@@ -5277,79 +5645,87 @@ msgctxt "vectors-action"
 msgid "L_ock strokes"
 msgstr "境界線を保護(_O)"
 
-#: ../app/actions/vectors-actions.c:168
+#: ../app/actions/vectors-actions.c:165
+#, fuzzy
+#| msgctxt "vectors-action"
+#| msgid "L_ock strokes"
+msgctxt "vectors-action"
+msgid "L_ock position"
+msgstr "境界線を保護(_O)"
+
+#: ../app/actions/vectors-actions.c:174
 msgctxt "vectors-action"
 msgid "Path to Sele_ction"
 msgstr "パスを選択範囲に(_C)"
 
-#: ../app/actions/vectors-actions.c:169
+#: ../app/actions/vectors-actions.c:175
 msgctxt "vectors-action"
 msgid "Path to selection"
 msgstr "パスから選択範囲を作成します"
 
-#: ../app/actions/vectors-actions.c:174
+#: ../app/actions/vectors-actions.c:180
 msgctxt "vectors-action"
 msgid "Fr_om Path"
 msgstr "パスを選択範囲に(_O)"
 
-#: ../app/actions/vectors-actions.c:175
+#: ../app/actions/vectors-actions.c:181
 msgctxt "vectors-action"
 msgid "Replace selection with path"
 msgstr "パスから選択範囲を作成します"
 
-#: ../app/actions/vectors-actions.c:180
+#: ../app/actions/vectors-actions.c:186
 msgctxt "vectors-action"
 msgid "_Add to Selection"
 msgstr "選択範囲に加える(_A)"
 
-#: ../app/actions/vectors-actions.c:181
+#: ../app/actions/vectors-actions.c:187
 msgctxt "vectors-action"
 msgid "Add path to selection"
 msgstr "選択範囲にパスによる範囲を加えます"
 
-#: ../app/actions/vectors-actions.c:186
+#: ../app/actions/vectors-actions.c:192
 msgctxt "vectors-action"
 msgid "_Subtract from Selection"
 msgstr "選択範囲から引く(_S)"
 
-#: ../app/actions/vectors-actions.c:187
+#: ../app/actions/vectors-actions.c:193
 msgctxt "vectors-action"
 msgid "Subtract path from selection"
 msgstr "選択範囲からパスによる範囲を引きます"
 
-#: ../app/actions/vectors-actions.c:192
+#: ../app/actions/vectors-actions.c:198
 msgctxt "vectors-action"
 msgid "_Intersect with Selection"
 msgstr "選択範囲との交わり(_I)"
 
-#: ../app/actions/vectors-actions.c:193
+#: ../app/actions/vectors-actions.c:199
 msgctxt "vectors-action"
 msgid "Intersect path with selection"
 msgstr "選択範囲とパスによる範囲との交差部分を新しい選択範囲にします"
 
-#: ../app/actions/vectors-actions.c:201
+#: ../app/actions/vectors-actions.c:207
 msgctxt "vectors-action"
 msgid "Selecti_on to Path"
 msgstr "選択範囲をパスに(_O)"
 
-#: ../app/actions/vectors-actions.c:202 ../app/actions/vectors-actions.c:208
+#: ../app/actions/vectors-actions.c:208 ../app/actions/vectors-actions.c:214
 msgctxt "vectors-action"
 msgid "Selection to path"
 msgstr "選択範囲をパスに変換します"
 
-#: ../app/actions/vectors-actions.c:207
+#: ../app/actions/vectors-actions.c:213
 msgctxt "vectors-action"
 msgid "To _Path"
 msgstr "選択範囲をパスに(_P)"
 
-#: ../app/actions/vectors-actions.c:213
+#: ../app/actions/vectors-actions.c:219
 msgctxt "vectors-action"
 msgid "Selection to Path (_Advanced)"
 msgstr "選択範囲をパスに (高度なオプション) (_A)"
 
 # 表記揺れではない。
 # 非常に高度な設定らしい(設定項目は、多言語への翻訳が許されていない)ので、あえて「高度なオプション」としている。
-#: ../app/actions/vectors-actions.c:214
+#: ../app/actions/vectors-actions.c:220
 msgctxt "vectors-action"
 msgid "Advanced options"
 msgstr "高度なオプション"
@@ -5362,8 +5738,8 @@ msgstr "パス名の変更"
 msgid "Edit Path Attributes"
 msgstr "パス名を変更"
 
-#: ../app/actions/vectors-commands.c:165 ../app/vectors/gimpvectors.c:208
-#: ../app/widgets/gimpvectorstreeview.c:250
+#: ../app/actions/vectors-commands.c:165 ../app/vectors/gimpvectors.c:207
+#: ../app/widgets/gimpvectorstreeview.c:254
 msgid "Path"
 msgstr "パス"
 
@@ -5376,487 +5752,566 @@ msgid "New Path Options"
 msgstr "新しいパスを追加"
 
 #: ../app/actions/vectors-commands.c:395 ../app/tools/gimpvectoroptions.c:200
-#: ../app/tools/gimpvectortool.c:1975
+#: ../app/tools/gimpvectortool.c:1976
 msgid "Stroke Path"
 msgstr "パスの境界線を描画"
 
-#: ../app/actions/view-actions.c:68
+#: ../app/actions/view-actions.c:69
 msgctxt "view-action"
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../app/actions/view-actions.c:69
+#: ../app/actions/view-actions.c:70
 msgctxt "view-action"
 msgid "_Zoom"
 msgstr "ズーム(_Z)"
 
-#: ../app/actions/view-actions.c:70
+#: ../app/actions/view-actions.c:71
+#, fuzzy
+#| msgid "_Rotate"
+msgctxt "view-action"
+msgid "_Rotate"
+msgstr "回転(_R)"
+
+#: ../app/actions/view-actions.c:72
 msgctxt "view-action"
 msgid "_Padding Color"
 msgstr "キャンバス周りの色(_P)"
 
-#: ../app/actions/view-actions.c:72
+#: ../app/actions/view-actions.c:74
 msgctxt "view-action"
 msgid "Move to Screen"
 msgstr "スクリーンに移動"
 
-#: ../app/actions/view-actions.c:76
+#: ../app/actions/view-actions.c:78
 msgctxt "view-action"
 msgid "_New View"
 msgstr "新しいビュー(_N)"
 
-#: ../app/actions/view-actions.c:77
+#: ../app/actions/view-actions.c:79
 msgctxt "view-action"
 msgid "Create another view on this image"
 msgstr "この画像を別ウィンドウで表示します"
 
-#: ../app/actions/view-actions.c:82
+#: ../app/actions/view-actions.c:84
 msgctxt "view-action"
-msgid "_Close"
-msgstr "閉じる(_C)"
+msgid "_Close View"
+msgstr "ビューを閉じる(_C)"
 
-#: ../app/actions/view-actions.c:83
+#: ../app/actions/view-actions.c:85
 msgctxt "view-action"
-msgid "Close this image window"
+msgid "Close the active image view"
 msgstr ""
-"この画像の編集を終了し画像を閉じます (開いている画像ウィンドウがこの画像のみ"
-"のときは、画像は閉じられますがウィンドウは閉じられません)"
+"アクティブなビューの画像の編集を終了し画像を閉じます (開いている画像ウィンド"
+"ウがこの画像のみのときは、画像は閉じられますがウィンドウは閉じられません)"
 
-#: ../app/actions/view-actions.c:88
+#: ../app/actions/view-actions.c:90
 msgctxt "view-action"
 msgid "_Fit Image in Window"
 msgstr "ウィンドウ内に全体を表示(_F)"
 
-#: ../app/actions/view-actions.c:89
+#: ../app/actions/view-actions.c:91
 msgctxt "view-action"
 msgid "Adjust the zoom ratio so that the image becomes fully visible"
 msgstr "ウィンドウ内に画像すべてが表示されるように表示倍率を調整します"
 
-#: ../app/actions/view-actions.c:94
+#: ../app/actions/view-actions.c:96
 msgctxt "view-action"
 msgid "Fi_ll Window"
 msgstr "ウィンドウ内に最大表示(_L)"
 
-#: ../app/actions/view-actions.c:95
+#: ../app/actions/view-actions.c:97
 msgctxt "view-action"
 msgid "Adjust the zoom ratio so that the entire window is used"
 msgstr "ウィンドウ内に画像が最大限表示されるように表示倍率を調整します"
 
-#: ../app/actions/view-actions.c:100
+#: ../app/actions/view-actions.c:102
 msgctxt "view-action"
 msgid "Re_vert Zoom"
 msgstr "表示倍率を戻す(_V)"
 
-#: ../app/actions/view-actions.c:101
+#: ../app/actions/view-actions.c:103
 msgctxt "view-action"
 msgid "Restore the previous zoom level"
 msgstr "前回の表示倍率に戻します"
 
-#: ../app/actions/view-actions.c:106
+#: ../app/actions/view-actions.c:108
+msgctxt "view-action"
+msgid "_Reset to 0°"
+msgstr ""
+
+#: ../app/actions/view-actions.c:109
+#, fuzzy
+#| msgid "Reset angle to zero"
+msgctxt "view-action"
+msgid "Reset the angle of rotation to 0°"
+msgstr "角度を 0 度に戻します"
+
+#: ../app/actions/view-actions.c:114
+#, fuzzy
+#| msgctxt "view-zoom-action"
+#| msgid "Othe_r..."
+msgctxt "view-action"
+msgid "Othe_r..."
+msgstr "任意の倍率(_R)..."
+
+#: ../app/actions/view-actions.c:115
+#, fuzzy
+#| msgctxt "view-zoom-action"
+#| msgid "Set a custom zoom factor"
+msgctxt "view-action"
+msgid "Set a custom rotation angle"
+msgstr "表示倍率を指定します"
+
+#: ../app/actions/view-actions.c:120
 msgctxt "view-action"
 msgid "Na_vigation Window"
 msgstr "ナビゲーションウィンドウ(_V)"
 
-#: ../app/actions/view-actions.c:107
+#: ../app/actions/view-actions.c:121
 msgctxt "view-action"
 msgid "Show an overview window for this image"
 msgstr "この画像の鳥瞰図ウィンドウ(ナビゲーションウィンドウ)を表示します。"
 
-#: ../app/actions/view-actions.c:112
+#: ../app/actions/view-actions.c:126
 msgctxt "view-action"
 msgid "Display _Filters..."
 msgstr "ディスプレイフィルター(_F)..."
 
-#: ../app/actions/view-actions.c:113
+#: ../app/actions/view-actions.c:127
 msgctxt "view-action"
 msgid "Configure filters applied to this view"
 msgstr "このビューに適用するディスプレイフィルターを設定します"
 
-#: ../app/actions/view-actions.c:118
+#: ../app/actions/view-actions.c:132
 msgctxt "view-action"
 msgid "Shrink _Wrap"
 msgstr "ウィンドウサイズを合わせる(_W)"
 
-#: ../app/actions/view-actions.c:119
+#: ../app/actions/view-actions.c:133
 msgctxt "view-action"
 msgid "Reduce the image window to the size of the image display"
 msgstr "画像の表示サイズに従って、ウィンドウサイズを変更します"
 
-#: ../app/actions/view-actions.c:124
+#: ../app/actions/view-actions.c:138
 msgctxt "view-action"
 msgid "_Open Display..."
 msgstr "ディスプレイを開く(_O)..."
 
-#: ../app/actions/view-actions.c:125
+#: ../app/actions/view-actions.c:139
 msgctxt "view-action"
 msgid "Connect to another display"
 msgstr "別のディスプレイに接続します"
 
 # Photoshop の表記を倣う
-#: ../app/actions/view-actions.c:133
+#: ../app/actions/view-actions.c:147
 msgctxt "view-action"
 msgid "_Dot for Dot"
 msgstr "ピクセル等倍(_D)"
 
-#: ../app/actions/view-actions.c:134
+#: ../app/actions/view-actions.c:148
 msgctxt "view-action"
 msgid "A pixel on the screen represents an image pixel"
 msgstr "画像の 1 ピクセルを画面の 1 ピクセルで表示します"
 
-#: ../app/actions/view-actions.c:140
+#: ../app/actions/view-actions.c:154
 msgctxt "view-action"
 msgid "Show _Selection"
 msgstr "選択範囲境界線の表示(_S)"
 
-#: ../app/actions/view-actions.c:141
+#: ../app/actions/view-actions.c:155
 msgctxt "view-action"
 msgid "Display the selection outline"
 msgstr "選択範囲の境界線を表示します"
 
-#: ../app/actions/view-actions.c:147
+#: ../app/actions/view-actions.c:161
 msgctxt "view-action"
 msgid "Show _Layer Boundary"
 msgstr "レイヤー境界線の表示(_L)"
 
-#: ../app/actions/view-actions.c:148
+#: ../app/actions/view-actions.c:162
 msgctxt "view-action"
 msgid "Draw a border around the active layer"
 msgstr "アクティブなレイヤーの境界線を表示します"
 
-#: ../app/actions/view-actions.c:154
+#: ../app/actions/view-actions.c:168
 msgctxt "view-action"
 msgid "Show _Guides"
 msgstr "ガイドの表示(_G)"
 
-#: ../app/actions/view-actions.c:155
+#: ../app/actions/view-actions.c:169
 msgctxt "view-action"
 msgid "Display the image's guides"
 msgstr "ガイドを設定した場合、それを表示します"
 
-#: ../app/actions/view-actions.c:161
+#: ../app/actions/view-actions.c:175
 msgctxt "view-action"
 msgid "S_how Grid"
 msgstr "グリッドの表示(_H)"
 
-#: ../app/actions/view-actions.c:162
+#: ../app/actions/view-actions.c:176
 msgctxt "view-action"
 msgid "Display the image's grid"
 msgstr "グリッドを表示します"
 
-#: ../app/actions/view-actions.c:168
+#: ../app/actions/view-actions.c:182
 msgctxt "view-action"
 msgid "Show Sample Points"
 msgstr "サンプルポイントの表示"
 
-#: ../app/actions/view-actions.c:169
+#: ../app/actions/view-actions.c:183
 msgctxt "view-action"
 msgid "Display the image's color sample points"
 msgstr "サンプルポイントを表示します"
 
-#: ../app/actions/view-actions.c:175
+#: ../app/actions/view-actions.c:189
 msgctxt "view-action"
 msgid "Sn_ap to Guides"
 msgstr "ガイドにスナップ(_A)"
 
-#: ../app/actions/view-actions.c:176
+#: ../app/actions/view-actions.c:190
 msgctxt "view-action"
 msgid "Tool operations snap to guides"
 msgstr "ツールによる操作をガイドにスナップさせます"
 
-#: ../app/actions/view-actions.c:182
+#: ../app/actions/view-actions.c:196
 msgctxt "view-action"
 msgid "Sna_p to Grid"
 msgstr "グリッドにスナップ(_P)"
 
-#: ../app/actions/view-actions.c:183
+#: ../app/actions/view-actions.c:197
 msgctxt "view-action"
 msgid "Tool operations snap to the grid"
 msgstr "ツールによる操作をグリッドにスナップさせます"
 
-#: ../app/actions/view-actions.c:189
+#: ../app/actions/view-actions.c:203
 msgctxt "view-action"
 msgid "Snap to _Canvas Edges"
 msgstr "キャンバス境界にスナップ(_C)"
 
-#: ../app/actions/view-actions.c:190
+#: ../app/actions/view-actions.c:204
 msgctxt "view-action"
 msgid "Tool operations snap to the canvas edges"
 msgstr "ツールによる操作をキャンバス境界にスナップさせます"
 
-#: ../app/actions/view-actions.c:196
+#: ../app/actions/view-actions.c:210
 msgctxt "view-action"
 msgid "Snap t_o Active Path"
 msgstr "アクティブなパスにスナップ(_O)"
 
-#: ../app/actions/view-actions.c:197
+#: ../app/actions/view-actions.c:211
 msgctxt "view-action"
 msgid "Tool operations snap to the active path"
 msgstr "ツールによる操作をアクティブなパスにスナップさせます"
 
-#: ../app/actions/view-actions.c:203
+#: ../app/actions/view-actions.c:217
 msgctxt "view-action"
 msgid "Show _Menubar"
 msgstr "メニューバーの表示(_M)"
 
-#: ../app/actions/view-actions.c:204
+#: ../app/actions/view-actions.c:218
 msgctxt "view-action"
 msgid "Show this window's menubar"
 msgstr "このウィンドウにメニューバーを表示します"
 
-#: ../app/actions/view-actions.c:210
+#: ../app/actions/view-actions.c:224
 msgctxt "view-action"
 msgid "Show R_ulers"
 msgstr "ルーラーの表示(_U)"
 
-#: ../app/actions/view-actions.c:211
+#: ../app/actions/view-actions.c:225
 msgctxt "view-action"
 msgid "Show this window's rulers"
 msgstr "ルーラーを表示します"
 
-#: ../app/actions/view-actions.c:217
+#: ../app/actions/view-actions.c:231
 msgctxt "view-action"
 msgid "Show Scroll_bars"
 msgstr "スクロールバーの表示(_B)"
 
-#: ../app/actions/view-actions.c:218
+#: ../app/actions/view-actions.c:232
 msgctxt "view-action"
 msgid "Show this window's scrollbars"
 msgstr "このウィンドウにスクロールバーを表示します"
 
-#: ../app/actions/view-actions.c:224
+#: ../app/actions/view-actions.c:238
 msgctxt "view-action"
 msgid "Show S_tatusbar"
 msgstr "ステータスバーの表示(_T)"
 
-#: ../app/actions/view-actions.c:225
+#: ../app/actions/view-actions.c:239
 msgctxt "view-action"
 msgid "Show this window's statusbar"
 msgstr "このウィンドウにステータスバーを表示します"
 
-#: ../app/actions/view-actions.c:231
+#: ../app/actions/view-actions.c:245
 msgctxt "view-action"
 msgid "Fullscr_een"
 msgstr "フルスクリーン(_E)"
 
-#: ../app/actions/view-actions.c:232
+#: ../app/actions/view-actions.c:246
 msgctxt "view-action"
 msgid "Toggle fullscreen view"
 msgstr "通常表示/フルスクリーン表示を切り替えます"
 
-#: ../app/actions/view-actions.c:238
-msgctxt "view-action"
-msgid "Use GEGL"
-msgstr "GEGL を使用"
-
-#: ../app/actions/view-actions.c:239
-msgctxt "view-action"
-msgid "Use GEGL to create this window's projection"
-msgstr "このウィンドウの投射に GEGL を使用します"
-
-#: ../app/actions/view-actions.c:263
+#: ../app/actions/view-actions.c:270
 msgctxt "view-zoom-action"
 msgid "Zoom _Out"
 msgstr "縮小表示(_O)"
 
-#: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276
+#: ../app/actions/view-actions.c:271 ../app/actions/view-actions.c:283
 msgctxt "view-zoom-action"
 msgid "Zoom out"
 msgstr "表示倍率を下げて縮小表示します"
 
-#: ../app/actions/view-actions.c:269
+#: ../app/actions/view-actions.c:276
 msgctxt "view-zoom-action"
 msgid "Zoom _In"
 msgstr "拡大表示(_I)"
 
-#: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282
+#: ../app/actions/view-actions.c:277 ../app/actions/view-actions.c:289
 msgctxt "view-zoom-action"
 msgid "Zoom in"
 msgstr "表示倍率を上げて拡大表示します"
 
-#: ../app/actions/view-actions.c:275
+#: ../app/actions/view-actions.c:282
 msgctxt "view-zoom-action"
 msgid "Zoom Out"
 msgstr "縮小表示"
 
-#: ../app/actions/view-actions.c:281
+#: ../app/actions/view-actions.c:288
 msgctxt "view-zoom-action"
 msgid "Zoom In"
 msgstr "拡大表示"
 
-#: ../app/actions/view-actions.c:300 ../app/actions/view-actions.c:306
+#: ../app/actions/view-actions.c:307 ../app/actions/view-actions.c:313
 msgctxt "view-zoom-action"
 msgid "1_6:1  (1600%)"
 msgstr "16:1  (1600%)(_6)"
 
-#: ../app/actions/view-actions.c:301 ../app/actions/view-actions.c:307
+#: ../app/actions/view-actions.c:308 ../app/actions/view-actions.c:314
 msgctxt "view-zoom-action"
 msgid "Zoom 16:1"
 msgstr "16倍表示します"
 
-#: ../app/actions/view-actions.c:312 ../app/actions/view-actions.c:318
+#: ../app/actions/view-actions.c:319 ../app/actions/view-actions.c:325
 msgctxt "view-zoom-action"
 msgid "_8:1  (800%)"
 msgstr "8:1  (800%)(_8)"
 
-#: ../app/actions/view-actions.c:313 ../app/actions/view-actions.c:319
+#: ../app/actions/view-actions.c:320 ../app/actions/view-actions.c:326
 msgctxt "view-zoom-action"
 msgid "Zoom 8:1"
 msgstr "8倍表示します"
 
-#: ../app/actions/view-actions.c:324 ../app/actions/view-actions.c:330
+#: ../app/actions/view-actions.c:331 ../app/actions/view-actions.c:337
 msgctxt "view-zoom-action"
 msgid "_4:1  (400%)"
 msgstr "4:1  (400%)(_4)"
 
-#: ../app/actions/view-actions.c:325 ../app/actions/view-actions.c:331
+#: ../app/actions/view-actions.c:332 ../app/actions/view-actions.c:338
 msgctxt "view-zoom-action"
 msgid "Zoom 4:1"
 msgstr "4倍表示します"
 
-#: ../app/actions/view-actions.c:336 ../app/actions/view-actions.c:342
+#: ../app/actions/view-actions.c:343 ../app/actions/view-actions.c:349
 msgctxt "view-zoom-action"
 msgid "_2:1  (200%)"
 msgstr "2:1  (200%)(_2)"
 
-#: ../app/actions/view-actions.c:337 ../app/actions/view-actions.c:343
+#: ../app/actions/view-actions.c:344 ../app/actions/view-actions.c:350
 msgctxt "view-zoom-action"
 msgid "Zoom 2:1"
 msgstr "2倍表示します"
 
-#: ../app/actions/view-actions.c:348 ../app/actions/view-actions.c:354
+#: ../app/actions/view-actions.c:355 ../app/actions/view-actions.c:361
 msgctxt "view-zoom-action"
 msgid "_1:1  (100%)"
 msgstr "1:1  (100%)(_1)"
 
-#: ../app/actions/view-actions.c:349 ../app/actions/view-actions.c:355
+#: ../app/actions/view-actions.c:356 ../app/actions/view-actions.c:362
 msgctxt "view-zoom-action"
 msgid "Zoom 1:1"
 msgstr "原寸で表示します"
 
-#: ../app/actions/view-actions.c:360
+#: ../app/actions/view-actions.c:367
 msgctxt "view-zoom-action"
 msgid "1:_2  (50%)"
 msgstr "1:2  (50%)(_2)"
 
-#: ../app/actions/view-actions.c:361
+#: ../app/actions/view-actions.c:368
 msgctxt "view-zoom-action"
 msgid "Zoom 1:2"
 msgstr "1/2倍で表示します"
 
-#: ../app/actions/view-actions.c:366
+#: ../app/actions/view-actions.c:373
 msgctxt "view-zoom-action"
 msgid "1:_4  (25%)"
 msgstr "1:4  (25%)(_4)"
 
-#: ../app/actions/view-actions.c:367
+#: ../app/actions/view-actions.c:374
 msgctxt "view-zoom-action"
 msgid "Zoom 1:4"
 msgstr "1/4倍で表示します"
 
-#: ../app/actions/view-actions.c:372
+#: ../app/actions/view-actions.c:379
 msgctxt "view-zoom-action"
 msgid "1:_8  (12.5%)"
 msgstr "1:8  (12.5%)(_8)"
 
-#: ../app/actions/view-actions.c:373
+#: ../app/actions/view-actions.c:380
 msgctxt "view-zoom-action"
 msgid "Zoom 1:8"
 msgstr "1/8倍で表示します"
 
-#: ../app/actions/view-actions.c:378
+#: ../app/actions/view-actions.c:385
 msgctxt "view-zoom-action"
 msgid "1:1_6  (6.25%)"
 msgstr "1:16  (6.25%)(_6)"
 
-#: ../app/actions/view-actions.c:379
+#: ../app/actions/view-actions.c:386
 msgctxt "view-zoom-action"
 msgid "Zoom 1:16"
 msgstr "1/16倍で表示します"
 
-#: ../app/actions/view-actions.c:384
+#: ../app/actions/view-actions.c:391
 msgctxt "view-zoom-action"
 msgid "Othe_r..."
 msgstr "任意の倍率(_R)..."
 
-#: ../app/actions/view-actions.c:385
+#: ../app/actions/view-actions.c:392
 msgctxt "view-zoom-action"
 msgid "Set a custom zoom factor"
 msgstr "表示倍率を指定します"
 
-#: ../app/actions/view-actions.c:393
+#: ../app/actions/view-actions.c:400
+#, fuzzy
+#| msgctxt "drawable-action"
+#| msgid "Rotate 90° _clockwise"
+msgctxt "view-action"
+msgid "Rotate 90° _clockwise"
+msgstr "時計回りに 90 度回転(_C)"
+
+#: ../app/actions/view-actions.c:401
+#, fuzzy
+#| msgctxt "drawable-action"
+#| msgid "Rotate 90 degrees to the right"
+msgctxt "view-action"
+msgid "Rotate 90 degrees to the right"
+msgstr "アイテムを時計回り (右) に 90 度回転します"
+
+#: ../app/actions/view-actions.c:406
+#, fuzzy
+#| msgctxt "drawable-action"
+#| msgid "Rotate _180°"
+msgctxt "view-action"
+msgid "Rotate _180°"
+msgstr "180 度回転(_1)"
+
+#: ../app/actions/view-actions.c:407
+#, fuzzy
+#| msgctxt "drawable-action"
+#| msgid "Turn upside-down"
+msgctxt "view-action"
+msgid "Turn upside-down"
+msgstr "180 度回転します"
+
+#: ../app/actions/view-actions.c:412
+#, fuzzy
+#| msgctxt "drawable-action"
+#| msgid "Rotate 90° counter-clock_wise"
+msgctxt "view-action"
+msgid "Rotate 90° counter-clock_wise"
+msgstr "反時計回りに 90 度回転(_W)"
+
+#: ../app/actions/view-actions.c:413
+#, fuzzy
+#| msgctxt "drawable-action"
+#| msgid "Rotate 90 degrees to the left"
+msgctxt "view-action"
+msgid "Rotate 90 degrees to the left"
+msgstr "アイテムを反時計回り (左) に 90 度回転します"
+
+#: ../app/actions/view-actions.c:421
 msgctxt "view-padding-color"
 msgid "From _Theme"
 msgstr "テーマから(_T)"
 
-#: ../app/actions/view-actions.c:394
+#: ../app/actions/view-actions.c:422
 msgctxt "view-padding-color"
 msgid "Use the current theme's background color"
 msgstr "テーマの背景色を使います"
 
-#: ../app/actions/view-actions.c:399
+#: ../app/actions/view-actions.c:427
 msgctxt "view-padding-color"
 msgid "_Light Check Color"
 msgstr "明るい市松模様(_L)"
 
-#: ../app/actions/view-actions.c:400
+#: ../app/actions/view-actions.c:428
 msgctxt "view-padding-color"
 msgid "Use the light check color"
 msgstr "キャンバス周りの色に明るい市松模様を使います"
 
-#: ../app/actions/view-actions.c:405
+#: ../app/actions/view-actions.c:433
 msgctxt "view-padding-color"
 msgid "_Dark Check Color"
 msgstr "暗い市松模様(_D)"
 
-#: ../app/actions/view-actions.c:406
+#: ../app/actions/view-actions.c:434
 msgctxt "view-padding-color"
 msgid "Use the dark check color"
 msgstr "キャンバス周りの色に暗い市松模様を使います"
 
-#: ../app/actions/view-actions.c:411
+#: ../app/actions/view-actions.c:439
 msgctxt "view-padding-color"
 msgid "Select _Custom Color..."
 msgstr "その他の色(_C)..."
 
-#: ../app/actions/view-actions.c:412
+#: ../app/actions/view-actions.c:440
 msgctxt "view-padding-color"
 msgid "Use an arbitrary color"
 msgstr "キャンバス周りの色を指定します"
 
-#: ../app/actions/view-actions.c:417
+#: ../app/actions/view-actions.c:445
 msgctxt "view-padding-color"
 msgid "As in _Preferences"
 msgstr "既定値に戻す(_P)"
 
-#: ../app/actions/view-actions.c:419
+#: ../app/actions/view-actions.c:447
 msgctxt "view-padding-color"
 msgid "Reset padding color to what's configured in preferences"
 msgstr "設定ダイアログで指定した色に戻します"
 
-#: ../app/actions/view-actions.c:618
+#: ../app/actions/view-actions.c:647
 #, c-format
 msgid "Re_vert Zoom (%d%%)"
 msgstr "表示倍率を %d% に戻す(_V)"
 
-#: ../app/actions/view-actions.c:626
+#: ../app/actions/view-actions.c:655
 msgid "Re_vert Zoom"
 msgstr "ズームを戻す(_V)"
 
-#: ../app/actions/view-actions.c:761
+#: ../app/actions/view-actions.c:798
 #, c-format
 msgid "Othe_r (%s)..."
 msgstr "その他 (%s)(_R)..."
 
-#: ../app/actions/view-actions.c:770
+#: ../app/actions/view-actions.c:807
 #, c-format
 msgid "_Zoom (%s)"
 msgstr "表示倍率 (%s)(_Z)"
 
-#: ../app/actions/view-commands.c:585
+#: ../app/actions/view-actions.c:823
+#, fuzzy, c-format
+#| msgid "_Rotate"
+msgid "_Rotate (%d°)"
+msgstr "回転(_R)"
+
+#: ../app/actions/view-commands.c:652
 msgid "Set Canvas Padding Color"
 msgstr "キャンバス周りの表示色"
 
-#: ../app/actions/view-commands.c:587
+#: ../app/actions/view-commands.c:654
 msgid "Set Custom Canvas Padding Color"
 msgstr "キャンバス周りの表示色"
 
@@ -5870,82 +6325,136 @@ msgstr "スクリーン %s"
 msgid "Move this window to screen %s"
 msgstr "このウィンドウをスクリーン %s に移動します"
 
-#: ../app/actions/windows-actions.c:95
+#: ../app/actions/windows-actions.c:97
 msgctxt "windows-action"
 msgid "_Windows"
 msgstr "ウィンドウ(_W)"
 
-#: ../app/actions/windows-actions.c:97
+#: ../app/actions/windows-actions.c:99
 msgctxt "windows-action"
 msgid "_Recently Closed Docks"
 msgstr "最近閉じたドック(_R)"
 
-#: ../app/actions/windows-actions.c:99
+#: ../app/actions/windows-actions.c:101
 msgctxt "windows-action"
 msgid "_Dockable Dialogs"
 msgstr "ドッキング可能なダイアログ(_D)"
 
-#: ../app/actions/windows-actions.c:102
+#: ../app/actions/windows-actions.c:104
 msgctxt "windows-action"
 msgid "Next Image"
 msgstr "次の画像"
 
-#: ../app/actions/windows-actions.c:103
+#: ../app/actions/windows-actions.c:105
 msgctxt "windows-action"
 msgid "Switch to the next image"
 msgstr "次の画像に移動します"
 
-#: ../app/actions/windows-actions.c:108
+#: ../app/actions/windows-actions.c:110
 msgctxt "windows-action"
 msgid "Previous Image"
 msgstr "前の画像"
 
-#: ../app/actions/windows-actions.c:109
+#: ../app/actions/windows-actions.c:111
 msgctxt "windows-action"
 msgid "Switch to the previous image"
 msgstr "前の画像に移動します"
 
-#: ../app/actions/windows-actions.c:117
+# ツールオプションダイアログで、矩形選択などの左上座標を示す(または入力)するテキストボックスのラベル
+#: ../app/actions/windows-actions.c:116
+#, fuzzy
+#| msgid "Position:"
+msgctxt "windows-action"
+msgid "_Tabs Position"
+msgstr "左上角の座標:"
+
+#: ../app/actions/windows-actions.c:122
 msgctxt "windows-action"
 msgid "Hide Docks"
 msgstr "ドックを隠す"
 
-#: ../app/actions/windows-actions.c:118
+#: ../app/actions/windows-actions.c:123
+#, fuzzy
+#| msgctxt "windows-action"
+#| msgid ""
+#| "When enabled docks and other dialogs are hidden, leaving only image "
+#| "windows."
 msgctxt "windows-action"
 msgid ""
-"When enabled docks and other dialogs are hidden, leaving only image windows."
+"When enabled, docks and other dialogs are hidden, leaving only image windows."
 msgstr ""
 "この設定をオンにすると、ドックとダイアログを隠して画像ウィンドウのみを表示し"
 "ます。"
 
-#: ../app/actions/windows-actions.c:124
+#: ../app/actions/windows-actions.c:129
 msgctxt "windows-action"
 msgid "Single-Window Mode"
 msgstr "シングルウィンドウモード"
 
-#: ../app/actions/windows-actions.c:125
+#: ../app/actions/windows-actions.c:130
+#, fuzzy
+#| msgctxt "windows-action"
+#| msgid "When enabled GIMP is in a single-window mode."
 msgctxt "windows-action"
-msgid "When enabled GIMP is in a single-window mode."
+msgid "When enabled, GIMP is in a single-window mode."
 msgstr "この設定がオンのときは、シングルウィンドウモードで表示します"
 
-#: ../app/base/tile-swap.c:711
-msgid ""
-"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."
+#: ../app/actions/windows-actions.c:139
+msgctxt "windows-tabs-position-action"
+msgid "_Top"
 msgstr ""
-"スワップファイルを開けません。メモリが不足してもスワップファイルが使えなくな"
-"ります。画像の構成要素が欠ける可能性がありますので、現在のファイル名とは異な"
-"る名前で作業中の画像を保存し GIMP を再起動してください。その後、設定ダイアロ"
-"グの [フォルダー] セクションでスワップ用フォルダーの場所を確認してください。"
 
-#: ../app/base/tile-swap.c:726
-#, c-format
-msgid "Failed to resize swap file: %s"
+#: ../app/actions/windows-actions.c:140
+#, fuzzy
+#| msgctxt "vectors-action"
+#| msgid "Raise this path to the top"
+msgctxt "windows-tabs-position-action"
+msgid "Position the tabs on the top"
+msgstr "このパスを最前面に移動します"
+
+#: ../app/actions/windows-actions.c:144
+#, fuzzy
+#| msgctxt "layers-action"
+#| msgid "Layer to _Bottom"
+msgctxt "windows-tabs-position-action"
+msgid "_Bottom"
+msgstr "レイヤーを最背面へ(_B)"
+
+#: ../app/actions/windows-actions.c:145
+#, fuzzy
+#| msgctxt "vectors-action"
+#| msgid "Lower this path to the bottom"
+msgctxt "windows-tabs-position-action"
+msgid "Position the tabs on the bottom"
+msgstr "このパスを最背面に移動します"
+
+#: ../app/actions/windows-actions.c:149
+msgctxt "windows-tabs-position-action"
+msgid "_Left"
+msgstr ""
+
+#: ../app/actions/windows-actions.c:150
+msgctxt "windows-tabs-position-action"
+msgid "Position the tabs on the left"
+msgstr ""
+
+#: ../app/actions/windows-actions.c:154
+#, fuzzy
+#| msgid "H_eight:"
+msgctxt "windows-tabs-position-action"
+msgid "_Right"
+msgstr "高さ(_E):"
+
+#: ../app/actions/windows-actions.c:155
+msgctxt "windows-tabs-position-action"
+msgid "Position the tabs on the right"
+msgstr ""
+
+#: ../app/actions/windows-commands.c:181
+msgid ""
+"The chosen recent dock contains a toolbox. Please close the currently open "
+"toolbox and try again."
 msgstr ""
-"スワップファイルのサイズ変更に失敗しました。\n"
-"%s"
 
 #: ../app/config/config-enums.c:24
 msgctxt "cursor-mode"
@@ -6052,33 +6561,62 @@ msgctxt "handedness"
 msgid "Right-handed"
 msgstr "右手"
 
-#: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:60
-#: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50
-#: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:57
-#: ../app/gui/themes.c:243 ../app/tools/gimpcurvestool.c:653
-#: ../app/tools/gimplevelstool.c:723 ../app/vectors/gimpvectors-export.c:81
-#: ../app/xcf/xcf.c:423
+#: ../app/config/config-enums.c:267
+msgctxt "position"
+msgid "Top"
+msgstr ""
+
+#: ../app/config/config-enums.c:268
+msgctxt "position"
+msgid "Bottom"
+msgstr ""
+
+#: ../app/config/config-enums.c:269
+msgctxt "position"
+msgid "Left"
+msgstr ""
+
+#: ../app/config/config-enums.c:270
+#, fuzzy
+#| msgid "Weight"
+msgctxt "position"
+msgid "Right"
+msgstr "ウエイト"
+
+#: ../app/config/gimpconfig-file.c:82 ../app/core/gimpbrushgenerated-save.c:61
+#: ../app/core/gimpcurve-save.c:53 ../app/core/gimpgradient-save.c:51
+#: ../app/core/gimpgradient-save.c:145 ../app/core/gimppalette-save.c:57
+#: ../app/gui/themes.c:243 ../app/tools/gimpcurvestool.c:662
+#: ../app/tools/gimplevelstool.c:685 ../app/vectors/gimpvectors-export.c:82
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr ""
 "'%s' を開いて書き込むことができません。\n"
 "%s"
 
-#: ../app/config/gimpconfig-file.c:78 ../app/config/gimpconfig-file.c:101
+#: ../app/config/gimpconfig-file.c:113
+#, fuzzy
+#| msgid "Error writing '%s': %s"
+msgid "Error parsing '%s': line longer than %"
+msgstr ""
+"'%s' への書き込み中にエラーが発生しました。\n"
+"%s"
+
+#: ../app/config/gimpconfig-file.c:144 ../app/config/gimpconfig-file.c:188
 #, c-format
 msgid "Error writing '%s': %s"
 msgstr ""
 "'%s' への書き込み中にエラーが発生しました。\n"
 "%s"
 
-#: ../app/config/gimpconfig-file.c:89
+#: ../app/config/gimpconfig-file.c:174
 #, c-format
 msgid "Error reading '%s': %s"
 msgstr ""
 "'%s' の読み込み中にエラーが発生しました。\n"
 "%s"
 
-#: ../app/config/gimpconfig-file.c:131
+#: ../app/config/gimpconfig-file.c:222
 #, c-format
 msgid ""
 "There was an error parsing your '%s' file. Default values will be used. A "
@@ -6124,24 +6662,20 @@ msgstr ""
 "します"
 
 #: ../app/config/gimprc-blurbs.h:46
-msgid "Ask for confirmation before closing an image without saving."
-msgstr "この設定がオンのときは、未保存の画像を閉じる前に保存の確認を行います。"
-
-#: ../app/config/gimprc-blurbs.h:49
 msgid "Sets the pixel format to use for mouse pointers."
 msgstr "GIMP が使うカーソルのピクセル形式を設定します"
 
-#: ../app/config/gimprc-blurbs.h:52
+#: ../app/config/gimprc-blurbs.h:49
 msgid "Sets the type of mouse pointers to use."
 msgstr "GIMP が使うカーソルモードを設定します"
 
-#: ../app/config/gimprc-blurbs.h:55
+#: ../app/config/gimprc-blurbs.h:52
 msgid "Sets the handedness for cursor positioning."
 msgstr ""
 "マウスを持つ手を設定します。マウスポインターの表示位置が設定に即した位置に変"
 "更されます。"
 
-#: ../app/config/gimprc-blurbs.h:58
+#: ../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."
@@ -6149,18 +6683,18 @@ msgstr ""
 "状況適応型のマウスカーソルは有用です。既定では有効になっています。多少のオー"
 "バーヘッドがあるため、無効にすることもできます。"
 
-#: ../app/config/gimprc-blurbs.h:74
+#: ../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 ""
 "この設定がオンのときは、画像の 1 ピクセルを画面の 1 ピクセルで表示します。"
 
-#: ../app/config/gimprc-blurbs.h:96
+#: ../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:112
+#: ../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 "
@@ -6172,7 +6706,7 @@ msgstr ""
 "す。種-充填は起点となるピクセルから、全方向にピクセルの彩度の変化が指定したし"
 "きい値になるまで展開していきます。ここで指定する値はその初期値です。"
 
-#: ../app/config/gimprc-blurbs.h:125
+#: ../app/config/gimprc-blurbs.h:122
 msgid ""
 "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 "
@@ -6182,36 +6716,36 @@ msgstr ""
 "す。この設定は、ウィンドウマネージャーがこれらのウィンドウをどう装飾・扱う"
 "か、ということに影響を与えます。"
 
-#: ../app/config/gimprc-blurbs.h:157
+#: ../app/config/gimprc-blurbs.h:154
 msgid "When enabled, the selected brush will be used for all tools."
 msgstr "この設定がオンのときは、選択したブラシをすべてのツールで使用します。"
 
-#: ../app/config/gimprc-blurbs.h:160
+#: ../app/config/gimprc-blurbs.h:157
 msgid "When enabled, the selected dynamics will be used for all tools."
 msgstr "この設定がオンのときは、選択した動的特性をすべてのツールで使用します。"
 
-#: ../app/config/gimprc-blurbs.h:166
+#: ../app/config/gimprc-blurbs.h:163
 msgid "When enabled, the selected gradient will be used for all tools."
 msgstr ""
 "この設定がオンのときは、選択したグラデーションをすべてのツールで使用します。"
 
-#: ../app/config/gimprc-blurbs.h:169
+#: ../app/config/gimprc-blurbs.h:166
 msgid "When enabled, the selected pattern will be used for all tools."
 msgstr "この設定がオンのときは、選択したパターンをすべてのツールで使用します。"
 
-#: ../app/config/gimprc-blurbs.h:183
+#: ../app/config/gimprc-blurbs.h:180
 msgid "Sets the browser used by the help system."
 msgstr "ヘルプシステムで使うブラウザーを指定します"
 
-#: ../app/config/gimprc-blurbs.h:194
+#: ../app/config/gimprc-blurbs.h:191
 msgid "Sets the text to appear in image window status bars."
 msgstr "画像ウィンドウのステータスバーに表示するテキストを設定します。"
 
-#: ../app/config/gimprc-blurbs.h:197
+#: ../app/config/gimprc-blurbs.h:194
 msgid "Sets the text to appear in image window titles."
 msgstr "画像ウィンドウのタイトルに表示するテキストを設定します。"
 
-#: ../app/config/gimprc-blurbs.h:200
+#: ../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."
@@ -6219,23 +6753,23 @@ msgstr ""
 "[ウィンドウに合わせる] のときは、画像全体がウィンドウ内に表示されるように表示"
 "倍率が調整されます。[1:1] のときは、等倍 (表示倍率 100%) で表示されます。"
 
-#: ../app/config/gimprc-blurbs.h:204
+#: ../app/config/gimprc-blurbs.h:201
 msgid ""
 "Sets the level of interpolation used for scaling and other transformations."
 msgstr ""
 "画像やレイヤーを拡大・縮小・変形するときに利用する補間方法の既定値を設定しま"
 "す。"
 
-#: ../app/config/gimprc-blurbs.h:211
+#: ../app/config/gimprc-blurbs.h:208
 msgid "Specifies the language to use for the user interface."
 msgstr "表示に使用する言語を指定します。"
 
-#: ../app/config/gimprc-blurbs.h:214
+#: ../app/config/gimprc-blurbs.h:211
 msgid "How many recently opened image filenames to keep on the File menu."
 msgstr ""
 "[ファイル] → [最近開いたファイル] で表示されるエントリーの数を設定します"
 
-#: ../app/config/gimprc-blurbs.h:217
+#: ../app/config/gimprc-blurbs.h:214
 msgid ""
 "Speed of marching ants in the selection outline.  This value is in "
 "milliseconds (less time indicates faster marching)."
@@ -6243,7 +6777,7 @@ msgstr ""
 "選択範囲表示のためのアニメーション (周囲を蟻が行進する) の進行速度をミリ秒単"
 "位で設定します。値を小さくすると速く行進するようになります。"
 
-#: ../app/config/gimprc-blurbs.h:221
+#: ../app/config/gimprc-blurbs.h:218
 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."
@@ -6251,7 +6785,7 @@ msgstr ""
 "ここで指定した以上のメモリ領域を必要とする画像を作成しようとすると、GIMP が警"
 "告します。"
 
-#: ../app/config/gimprc-blurbs.h:231
+#: ../app/config/gimprc-blurbs.h:228
 msgid ""
 "Sets the monitor's horizontal resolution, in dots per inch.  If set to 0, "
 "forces the X server to be queried for both horizontal and vertical "
@@ -6260,7 +6794,7 @@ msgstr ""
 "モニターの水平解像度を dpi 単位で設定します。 0 に設定すると、水平および垂直"
 "解像度の情報を X サーバーに問い合わせます。"
 
-#: ../app/config/gimprc-blurbs.h:236
+#: ../app/config/gimprc-blurbs.h:233
 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 "
@@ -6272,7 +6806,7 @@ msgstr ""
 # "This used to be the default behaviour in older versions." の箇所は次の理由により翻訳していない
 # - このバージョンの1つ前のバージョン (ver.2.6.x) では、既に「移動ツールでつかんだレイヤーやパスがアクティブになる」は既定値ではない。
 # - 以前のバージョンの既定値をツールチップで積極的に知らせる必要性があるとは思えない。
-#: ../app/config/gimprc-blurbs.h:241
+#: ../app/config/gimprc-blurbs.h:238
 msgid ""
 "If enabled, the move tool sets the edited layer or path as active.  This "
 "used to be the default behaviour in older versions."
@@ -6280,7 +6814,7 @@ msgstr ""
 "この設定がオンのときは、移動ツールでつかんだレイヤーやパスをアクティブにしま"
 "す。"
 
-#: ../app/config/gimprc-blurbs.h:245
+#: ../app/config/gimprc-blurbs.h:242
 msgid ""
 "Sets the size of the navigation preview available in the lower right corner "
 "of the image window."
@@ -6288,11 +6822,11 @@ msgstr ""
 "画像ウィンドウの右下に表示されるナビゲーションプレビューの大きさを設定しま"
 "す。"
 
-#: ../app/config/gimprc-blurbs.h:249
+#: ../app/config/gimprc-blurbs.h:246
 msgid "Sets how many processors GIMP should try to use simultaneously."
 msgstr "GIMP での処理で同時に使いたい CPU の数を指定します"
 
-#: ../app/config/gimprc-blurbs.h:262
+#: ../app/config/gimprc-blurbs.h:259
 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 "
@@ -6305,7 +6839,7 @@ msgstr ""
 "用いて描画する際に正確になりますが、多少遅くなります。(お使いの X サーバーに"
 "よっては、逆に速くなる場合もあります。)"
 
-#: ../app/config/gimprc-blurbs.h:278
+#: ../app/config/gimprc-blurbs.h:275
 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 "
@@ -6314,7 +6848,7 @@ msgstr ""
 "この設定がオンのときは、[レイヤー・チャンネル・パス] ダイアログでプレビューが"
 "表示されます。大きな画像を編集している場合には動作が重くなります。"
 
-#: ../app/config/gimprc-blurbs.h:283
+#: ../app/config/gimprc-blurbs.h:280
 msgid ""
 "Sets the preview size used for layers and channel previews in newly created "
 "dialogs."
@@ -6323,13 +6857,13 @@ msgstr ""
 "ダイアログから設定が有効になります。)"
 
 # ツールチップ
-#: ../app/config/gimprc-blurbs.h:287
+#: ../app/config/gimprc-blurbs.h:284
 msgid "Sets the default quick mask color."
 msgstr ""
 "クイックマスクモード時のマスク部分の表示色です。ここをクリックすると表示色を"
 "変更できます。"
 
-#: ../app/config/gimprc-blurbs.h:290
+#: ../app/config/gimprc-blurbs.h:287
 msgid ""
 "When enabled, the image window will automatically resize itself whenever the "
 "physical image size changes."
@@ -6337,7 +6871,7 @@ msgstr ""
 "この設定がオンのときは、キャンバスサイズ変更時に画像ウィンドウが自動的にサイ"
 "ズ変更されます。"
 
-#: ../app/config/gimprc-blurbs.h:294
+#: ../app/config/gimprc-blurbs.h:291
 msgid ""
 "When enabled, the image window will automatically resize itself when zooming "
 "into and out of images."
@@ -6345,18 +6879,18 @@ msgstr ""
 "この設定がオンのときは、画像の表示倍率変更時に画像ウィンドウが自動的にサイズ"
 "変更されます。"
 
-#: ../app/config/gimprc-blurbs.h:298
+#: ../app/config/gimprc-blurbs.h:295
 msgid "Let GIMP try to restore your last saved session on each startup."
 msgstr "起動時に、前回の状態の復元を試みます"
 
-#: ../app/config/gimprc-blurbs.h:301
+#: ../app/config/gimprc-blurbs.h:298
 msgid ""
 "Remember the current tool, pattern, color, and brush across GIMP sessions."
 msgstr ""
 "この設定がオンのときは、ツール・パターン・色・ブラシの状態を終了時に保存し次"
 "回起動時に引き継ぎます。"
 
-#: ../app/config/gimprc-blurbs.h:305
+#: ../app/config/gimprc-blurbs.h:302
 msgid ""
 "Keep a permanent record of all opened and saved files in the Recent "
 "Documents list."
@@ -6366,25 +6900,29 @@ msgstr ""
 "設定がオフのときは、GIMP の [最近開いたファイル] には記録されますが、システム"
 "には記録されません。"
 
-#: ../app/config/gimprc-blurbs.h:309
+#: ../app/config/gimprc-blurbs.h:306
 msgid "Save the positions and sizes of the main dialogs when GIMP exits."
 msgstr ""
 "この設定がオンのときは、GIMP 終了時のメインダイアログの位置と大きさを保存しま"
 "す。"
 
-#: ../app/config/gimprc-blurbs.h:312
+#: ../app/config/gimprc-blurbs.h:309
 msgid "Save the tool options when GIMP exits."
 msgstr "この設定がオンのときは、終了時にツールオプションを保存します。"
 
-#: ../app/config/gimprc-blurbs.h:318
+#: ../app/config/gimprc-blurbs.h:315
+#, fuzzy
+#| msgid ""
+#| "When enabled, all paint tools will show a preview of the current brush's "
+#| "outline."
 msgid ""
-"When enabled, all paint tools will show a preview of the current brush's "
-"outline."
+"When enabled, all brush-based paint tools will show a preview of the current "
+"brush's outline."
 msgstr ""
 "この設定がオンのときは、すべてのツールでアクティブなブラシのアウトラインプレ"
 "ビューが表示されます。"
 
-#: ../app/config/gimprc-blurbs.h:322
+#: ../app/config/gimprc-blurbs.h:319
 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 "
@@ -6394,13 +6932,17 @@ msgstr ""
 "グに表示します。(このボタンがない場合でも F1 キーでヘルプページを参照できま"
 "す。)"
 
-#: ../app/config/gimprc-blurbs.h:327
+#: ../app/config/gimprc-blurbs.h:324
+#, fuzzy
+#| msgid ""
+#| "When enabled, the mouse pointer will be shown over the image while using "
+#| "a paint tool."
 msgid ""
 "When enabled, the mouse pointer will be shown over the image while using a "
-"paint tool."
+"brush-based paint tool."
 msgstr "この設定がオンのときは、画像上に描画ツールのアイコンが表示されます。"
 
-#: ../app/config/gimprc-blurbs.h:331
+#: ../app/config/gimprc-blurbs.h:328
 msgid ""
 "When enabled, the menubar is visible by default. This can also be toggled "
 "with the \"View->Show Menubar\" command."
@@ -6408,7 +6950,7 @@ msgstr ""
 "この設定がオンのときは、画像ウィンドウにメニューバーを表示します。\n"
 "([表示] → [メニューバーの表示] で切り替えることもできます。)"
 
-#: ../app/config/gimprc-blurbs.h:335
+#: ../app/config/gimprc-blurbs.h:332
 msgid ""
 "When enabled, the rulers are visible by default. This can also be toggled "
 "with the \"View->Show Rulers\" command."
@@ -6416,7 +6958,7 @@ msgstr ""
 "この設定がオンのときは、画像ウィンドウにルーラーを表示します。\n"
 "([表示] → [ルーラーの表示] で切り替えることもできます。)"
 
-#: ../app/config/gimprc-blurbs.h:339
+#: ../app/config/gimprc-blurbs.h:336
 msgid ""
 "When enabled, the scrollbars are visible by default. This can also be "
 "toggled with the \"View->Show Scrollbars\" command."
@@ -6424,7 +6966,7 @@ msgstr ""
 "この設定がオンのときは、画像ウィンドウにスクロールバーを表示します。\n"
 "([表示] → [スクロールバーの表示]で切り替えることもできます。)"
 
-#: ../app/config/gimprc-blurbs.h:343
+#: ../app/config/gimprc-blurbs.h:340
 msgid ""
 "When enabled, the statusbar is visible by default. This can also be toggled "
 "with the \"View->Show Statusbar\" command."
@@ -6432,7 +6974,7 @@ msgstr ""
 "この設定がオンのときは、画像ウィンドウにステータスバーを表示します。\n"
 "([表示] → [ステータスバーの表示]で切り替えることもできます。)"
 
-#: ../app/config/gimprc-blurbs.h:347
+#: ../app/config/gimprc-blurbs.h:344
 msgid ""
 "When enabled, the selection is visible by default. This can also be toggled "
 "with the \"View->Show Selection\" command."
@@ -6441,7 +6983,7 @@ msgstr ""
 "ンを表示します。\n"
 "([表示] → [選択範囲境界線の表示]で切り替えることもできます。)"
 
-#: ../app/config/gimprc-blurbs.h:351
+#: ../app/config/gimprc-blurbs.h:348
 msgid ""
 "When enabled, the layer boundary is visible by default. This can also be "
 "toggled with the \"View->Show Layer Boundary\" command."
@@ -6449,7 +6991,7 @@ msgstr ""
 "この設定がオンのときは、レイヤー境界を表示します。\n"
 "([表示] → [レイヤー境界の表示]で切り替えることもできます。)"
 
-#: ../app/config/gimprc-blurbs.h:355
+#: ../app/config/gimprc-blurbs.h:352
 msgid ""
 "When enabled, the guides are visible by default. This can also be toggled "
 "with the \"View->Show Guides\" command."
@@ -6457,7 +6999,7 @@ msgstr ""
 "この設定がオンのときは、ガイドを表示します。\n"
 "([表示] → [ガイドの表示]で切り替えることもできます。)"
 
-#: ../app/config/gimprc-blurbs.h:359
+#: ../app/config/gimprc-blurbs.h:356
 msgid ""
 "When enabled, the grid is visible by default. This can also be toggled with "
 "the \"View->Show Grid\" command."
@@ -6465,7 +7007,7 @@ msgstr ""
 "この設定がオンのときは、グリッドを表示します。\n"
 "([表示] → [グリッドの表示]で切り替えることもできます。)"
 
-#: ../app/config/gimprc-blurbs.h:363
+#: ../app/config/gimprc-blurbs.h:360
 msgid ""
 "When enabled, the sample points are visible by default. This can also be "
 "toggled with the \"View->Show Sample Points\" command."
@@ -6473,25 +7015,25 @@ msgstr ""
 "この設定がオンのときは、サンプルポイントを表示します。\n"
 "([表示] → [サンプルポイントの表示]で切り替えることもできます。)"
 
-#: ../app/config/gimprc-blurbs.h:367
+#: ../app/config/gimprc-blurbs.h:364
 msgid "Show a tooltip when the pointer hovers over an item."
 msgstr ""
 "この設定がオンのときは、アイテム上にマウスポインターを乗せたときにツールチッ"
 "プ (アイテムについての簡単な説明) を表示します。"
 
-#: ../app/config/gimprc-blurbs.h:370
+#: ../app/config/gimprc-blurbs.h:367
 msgid "Use GIMP in a single-window mode."
 msgstr "シングルウィンドウモードで使用する"
 
-#: ../app/config/gimprc-blurbs.h:373
+#: ../app/config/gimprc-blurbs.h:370
 msgid "Hide docks and other windows, leaving only image windows."
 msgstr "ドックとダイアログを隠し、画像ウィンドウのみを表示します。"
 
-#: ../app/config/gimprc-blurbs.h:376
+#: ../app/config/gimprc-blurbs.h:373
 msgid "What to do when the space bar is pressed in the image window."
 msgstr "画像ウィンドウでスペースキーが押されたときの挙動を設定します"
 
-#: ../app/config/gimprc-blurbs.h:379
+#: ../app/config/gimprc-blurbs.h:376
 msgid ""
 "Sets the swap file location. GIMP uses a tile based memory allocation "
 "scheme. The swap file is used to quickly and easily swap tiles out to disk "
@@ -6508,11 +7050,11 @@ msgstr ""
 "合、非常に動作が遅くなってしまいます。そのため、\"/tmp\" にスワップファイルを"
 "作成するのが望ましいです。"
 
-#: ../app/config/gimprc-blurbs.h:388
+#: ../app/config/gimprc-blurbs.h:385
 msgid "When enabled, menus can be torn off."
 msgstr "この設定がオンのときは、メニューの切り離しが可能になります。"
 
-#: ../app/config/gimprc-blurbs.h:391
+#: ../app/config/gimprc-blurbs.h:388
 msgid ""
 "When enabled, you can change keyboard shortcuts for menu items by hitting a "
 "key combination while the menu item is highlighted."
@@ -6521,17 +7063,17 @@ msgstr ""
 "を可能にします。(メニューアイテムがハイライトになっているときに割り当てたい"
 "キーの組み合わせを押します。)"
 
-#: ../app/config/gimprc-blurbs.h:395
+#: ../app/config/gimprc-blurbs.h:392
 msgid "Save changed keyboard shortcuts when GIMP exits."
 msgstr ""
 "この設定がオンのときは、変更または新設したキーボードショートカットを GIMP 終"
 "了時に保存します。"
 
-#: ../app/config/gimprc-blurbs.h:398
+#: ../app/config/gimprc-blurbs.h:395
 msgid "Restore saved keyboard shortcuts on each GIMP startup."
 msgstr "GIMP 起動時に保存されているキーボードショートカットを読み込みます。"
 
-#: ../app/config/gimprc-blurbs.h:401
+#: ../app/config/gimprc-blurbs.h:398
 msgid ""
 "Sets the folder for temporary storage. Files will appear here during the "
 "course of running GIMP.  Most files will disappear when GIMP exits, but some "
@@ -6542,12 +7084,12 @@ msgstr ""
 "ファイルは GIMP 終了時に削除されますが、いくつかのファイルは残りますので他の"
 "ユーザーと共有されないフォルダーを指定することをお勧めします。"
 
-#: ../app/config/gimprc-blurbs.h:413
+#: ../app/config/gimprc-blurbs.h:410
 msgid "Sets the size of the thumbnail shown in the Open dialog."
 msgstr ""
 "[画像ファイルを開く] ダイアログで表示されるサムネイルの大きさを設定します"
 
-#: ../app/config/gimprc-blurbs.h:416
+#: ../app/config/gimprc-blurbs.h:413
 msgid ""
 "The thumbnail in the Open dialog will be automatically updated if the file "
 "being previewed is smaller than the size set here."
@@ -6555,7 +7097,7 @@ msgstr ""
 "ここで設定した値よりもプレビューしているファイルのファイルサイズが小さいとき"
 "は、[画像ファイルを開く] ダイアログのサムネイルが自動的に更新されます。"
 
-#: ../app/config/gimprc-blurbs.h:420
+#: ../app/config/gimprc-blurbs.h:417
 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 "
@@ -6568,33 +7110,33 @@ msgstr ""
 "おそれがあります。この値が大きい場合はより多くのメモリが必要ですが、パフォー"
 "マンスがある程度維持されます。"
 
-#: ../app/config/gimprc-blurbs.h:426
+#: ../app/config/gimprc-blurbs.h:423
 msgid "Show the current foreground and background colors in the toolbox."
 msgstr "現在の描画色と背景色をツールボックスに表示します"
 
-#: ../app/config/gimprc-blurbs.h:429
+#: ../app/config/gimprc-blurbs.h:426
 msgid "Show the currently selected brush, pattern and gradient in the toolbox."
 msgstr "現在のブラシ・パターン・グラデーションをツールボックスに表示します"
 
-#: ../app/config/gimprc-blurbs.h:432
+#: ../app/config/gimprc-blurbs.h:429
 msgid "Show the currently active image in the toolbox."
 msgstr "アクティブな画像のサムネイルをツールボックスに表示します"
 
-#: ../app/config/gimprc-blurbs.h:438
+#: ../app/config/gimprc-blurbs.h:435
 msgid "Sets the manner in which transparency is displayed in images."
 msgstr "画像内の透明部分の表示スタイルを設定します。"
 
-#: ../app/config/gimprc-blurbs.h:441
+#: ../app/config/gimprc-blurbs.h:438
 msgid "Sets the size of the checkerboard used to display transparency."
 msgstr "スタイルが [市松模様] の場合の柄の大きさを設定します。"
 
-#: ../app/config/gimprc-blurbs.h:444
+#: ../app/config/gimprc-blurbs.h:441
 msgid ""
 "When enabled, GIMP will not save an image if it has not been changed since "
 "it was opened."
 msgstr "この設定がオンのときは、画像に変更がない場合は保存しません"
 
-#: ../app/config/gimprc-blurbs.h:448
+#: ../app/config/gimprc-blurbs.h:445
 msgid ""
 "Sets the minimal number of operations that can be undone. More undo levels "
 "are kept available until the undo-size limit is reached."
@@ -6602,7 +7144,7 @@ msgstr ""
 "作業履歴の最小エントリー回数を指定します。ここで指定した回数分は [作業履歴の"
 "メモリサイズ] に左右されずに作業履歴にエントリーされます。"
 
-#: ../app/config/gimprc-blurbs.h:452
+#: ../app/config/gimprc-blurbs.h:449
 msgid ""
 "Sets an upper limit to the memory that is used per image to keep operations "
 "on the undo stack. Regardless of this setting, at least as many undo-levels "
@@ -6613,17 +7155,23 @@ msgstr ""
 "この設定に関わらず、[作業履歴の最小エントリー数] に設定された回数までは、作業"
 "履歴はエントリーされます。"
 
-#: ../app/config/gimprc-blurbs.h:457
+#: ../app/config/gimprc-blurbs.h:454
 msgid "Sets the size of the previews in the Undo History."
 msgstr "作業履歴のプレビューの大きさを設定します。"
 
-#: ../app/config/gimprc-blurbs.h:460
+#: ../app/config/gimprc-blurbs.h:457
 msgid "When enabled, pressing F1 will open the help browser."
 msgstr "この設定がオンのときは、F1 キーを押すとヘルプブラウザーが開きます。"
 
-#: ../app/config/gimprc-deserialize.c:136 ../app/core/gimp-modules.c:133
-#: ../app/core/gimp-units.c:167 ../app/gui/session.c:286
-#: ../app/plug-in/plug-in-rc.c:212
+#: ../app/config/gimprc-blurbs.h:460
+#, fuzzy
+#| msgid "When enabled, menus can be torn off."
+msgid "When enabled, uses OpenCL for some operations."
+msgstr "この設定がオンのときは、メニューの切り離しが可能になります。"
+
+#: ../app/config/gimprc-deserialize.c:136 ../app/core/gimp-modules.c:136
+#: ../app/core/gimp-units.c:167 ../app/gui/session.c:302
+#: ../app/plug-in/plug-in-rc.c:241
 msgid "fatal parse error"
 msgstr "致命的な解析エラー"
 
@@ -6632,1022 +7180,1105 @@ msgstr "致命的な解析エラー"
 msgid "value for token %s is not a valid UTF-8 string"
 msgstr "トークン %s の値は適切な UTF-8 文字列ではありません"
 
-#: ../app/core/core-enums.c:89
+#: ../app/core/core-enums.c:61
+msgctxt "component-type"
+msgid "8-bit integer"
+msgstr ""
+
+#: ../app/core/core-enums.c:62
+msgctxt "component-type"
+msgid "16-bit integer"
+msgstr ""
+
+#: ../app/core/core-enums.c:63
+msgctxt "component-type"
+msgid "32-bit integer"
+msgstr ""
+
+#: ../app/core/core-enums.c:64
+msgctxt "component-type"
+msgid "16-bit floating point"
+msgstr ""
+
+#: ../app/core/core-enums.c:65
+msgctxt "component-type"
+msgid "32-bit floating point"
+msgstr ""
+
+#: ../app/core/core-enums.c:124
 msgctxt "convert-dither-type"
 msgid "None"
 msgstr "ディザリングしない"
 
-#: ../app/core/core-enums.c:90
+#: ../app/core/core-enums.c:125
 msgctxt "convert-dither-type"
 msgid "Floyd-Steinberg (normal)"
 msgstr "誤差拡散 (通常)"
 
-#: ../app/core/core-enums.c:91
+#: ../app/core/core-enums.c:126
 msgctxt "convert-dither-type"
 msgid "Floyd-Steinberg (reduced color bleeding)"
 msgstr "誤差拡散 (補正あり)"
 
-#: ../app/core/core-enums.c:92
+#: ../app/core/core-enums.c:127
 msgctxt "convert-dither-type"
 msgid "Positioned"
 msgstr "ポジション"
 
-#: ../app/core/core-enums.c:122
+#: ../app/core/core-enums.c:157
 msgctxt "convert-palette-type"
 msgid "Generate optimum palette"
 msgstr "最適パレットを生成"
 
-#: ../app/core/core-enums.c:123
+#: ../app/core/core-enums.c:158
 msgctxt "convert-palette-type"
 msgid "Use web-optimized palette"
 msgstr "ウェブ用最適化パレットを使用"
 
-#: ../app/core/core-enums.c:124
+#: ../app/core/core-enums.c:159
 msgctxt "convert-palette-type"
 msgid "Use black and white (1-bit) palette"
 msgstr "モノクロ 2 階調 (1-bit) パレットを使用"
 
-#: ../app/core/core-enums.c:125
+#: ../app/core/core-enums.c:160
 msgctxt "convert-palette-type"
 msgid "Use custom palette"
 msgstr "カスタムパレットを使用"
 
-#: ../app/core/core-enums.c:184
+#: ../app/core/core-enums.c:219
 msgctxt "curve-type"
 msgid "Smooth"
 msgstr "なめらか"
 
-#: ../app/core/core-enums.c:185
+#: ../app/core/core-enums.c:220
 msgctxt "curve-type"
 msgid "Freehand"
 msgstr "自由曲線"
 
-#: ../app/core/core-enums.c:262
+#: ../app/core/core-enums.c:297
 msgctxt "histogram-channel"
 msgid "Value"
 msgstr "明度"
 
-#: ../app/core/core-enums.c:263
+#: ../app/core/core-enums.c:298
 msgctxt "histogram-channel"
 msgid "Red"
 msgstr "赤"
 
-#: ../app/core/core-enums.c:264
+#: ../app/core/core-enums.c:299
 msgctxt "histogram-channel"
 msgid "Green"
 msgstr "緑"
 
-#: ../app/core/core-enums.c:265
+#: ../app/core/core-enums.c:300
 msgctxt "histogram-channel"
 msgid "Blue"
 msgstr "青"
 
-#: ../app/core/core-enums.c:266
+#: ../app/core/core-enums.c:301
 msgctxt "histogram-channel"
 msgid "Alpha"
 msgstr "アルファ"
 
-#: ../app/core/core-enums.c:267
+#: ../app/core/core-enums.c:302
 msgctxt "histogram-channel"
 msgid "RGB"
 msgstr "RGB"
 
-#: ../app/core/core-enums.c:358
+#: ../app/core/core-enums.c:393
 msgctxt "layer-mode-effects"
 msgid "Normal"
 msgstr "標準"
 
-#: ../app/core/core-enums.c:359
+#: ../app/core/core-enums.c:394
 msgctxt "layer-mode-effects"
 msgid "Dissolve"
 msgstr "ディザー合成"
 
-#: ../app/core/core-enums.c:360
+#: ../app/core/core-enums.c:395
 msgctxt "layer-mode-effects"
 msgid "Behind"
 msgstr "後ろ"
 
-#: ../app/core/core-enums.c:361
+#: ../app/core/core-enums.c:396
 msgctxt "layer-mode-effects"
 msgid "Multiply"
 msgstr "乗算"
 
-#: ../app/core/core-enums.c:362
+#: ../app/core/core-enums.c:397
 msgctxt "layer-mode-effects"
 msgid "Screen"
 msgstr "スクリーン"
 
-#: ../app/core/core-enums.c:363
+#: ../app/core/core-enums.c:398
 msgctxt "layer-mode-effects"
 msgid "Overlay"
 msgstr "オーバーレイ"
 
-#: ../app/core/core-enums.c:364
+#: ../app/core/core-enums.c:399
 msgctxt "layer-mode-effects"
 msgid "Difference"
 msgstr "差の絶対値"
 
-#: ../app/core/core-enums.c:365
+#: ../app/core/core-enums.c:400
 msgctxt "layer-mode-effects"
 msgid "Addition"
 msgstr "加算"
 
-#: ../app/core/core-enums.c:366
+#: ../app/core/core-enums.c:401
 msgctxt "layer-mode-effects"
 msgid "Subtract"
 msgstr "減算"
 
-#: ../app/core/core-enums.c:367
+#: ../app/core/core-enums.c:402
 msgctxt "layer-mode-effects"
 msgid "Darken only"
 msgstr "比較(暗)"
 
-#: ../app/core/core-enums.c:368
+#: ../app/core/core-enums.c:403
 msgctxt "layer-mode-effects"
 msgid "Lighten only"
 msgstr "比較(明)"
 
-#: ../app/core/core-enums.c:369
+#: ../app/core/core-enums.c:404
 msgctxt "layer-mode-effects"
 msgid "Hue"
 msgstr "色相"
 
-#: ../app/core/core-enums.c:370
+#: ../app/core/core-enums.c:405
 msgctxt "layer-mode-effects"
 msgid "Saturation"
 msgstr "彩度"
 
-#: ../app/core/core-enums.c:371
+#: ../app/core/core-enums.c:406
 msgctxt "layer-mode-effects"
 msgid "Color"
 msgstr "色"
 
-#: ../app/core/core-enums.c:372
+#: ../app/core/core-enums.c:407
 msgctxt "layer-mode-effects"
 msgid "Value"
 msgstr "明度"
 
-#: ../app/core/core-enums.c:373
+#: ../app/core/core-enums.c:408
 msgctxt "layer-mode-effects"
 msgid "Divide"
 msgstr "除算"
 
-#: ../app/core/core-enums.c:374
+#: ../app/core/core-enums.c:409
 msgctxt "layer-mode-effects"
 msgid "Dodge"
 msgstr "覆い焼き"
 
-#: ../app/core/core-enums.c:375
+#: ../app/core/core-enums.c:410
 msgctxt "layer-mode-effects"
 msgid "Burn"
 msgstr "焼き込み"
 
-#: ../app/core/core-enums.c:376
+#: ../app/core/core-enums.c:411
 msgctxt "layer-mode-effects"
 msgid "Hard light"
 msgstr "ハードライト"
 
-#: ../app/core/core-enums.c:377
+#: ../app/core/core-enums.c:412
 msgctxt "layer-mode-effects"
 msgid "Soft light"
 msgstr "ソフトライト"
 
-#: ../app/core/core-enums.c:378
+#: ../app/core/core-enums.c:413
 msgctxt "layer-mode-effects"
 msgid "Grain extract"
 msgstr "微粒取り出し"
 
-#: ../app/core/core-enums.c:379
+#: ../app/core/core-enums.c:414
 msgctxt "layer-mode-effects"
 msgid "Grain merge"
 msgstr "微粒結合"
 
-#: ../app/core/core-enums.c:380
+#: ../app/core/core-enums.c:415
 msgctxt "layer-mode-effects"
 msgid "Color erase"
 msgstr "色消しゴム"
 
-#: ../app/core/core-enums.c:381
+#: ../app/core/core-enums.c:416
 msgctxt "layer-mode-effects"
 msgid "Erase"
 msgstr "消しゴム"
 
-#: ../app/core/core-enums.c:382
+#: ../app/core/core-enums.c:417
 msgctxt "layer-mode-effects"
 msgid "Replace"
 msgstr "置換"
 
-#: ../app/core/core-enums.c:383
+#: ../app/core/core-enums.c:418
 msgctxt "layer-mode-effects"
 msgid "Anti erase"
 msgstr "逆消しゴム"
 
-#: ../app/core/core-enums.c:464
+#: ../app/core/core-enums.c:499
 msgctxt "align-reference-type"
 msgid "First item"
 msgstr "最初のアイテム"
 
-#: ../app/core/core-enums.c:465
+#: ../app/core/core-enums.c:500
 msgctxt "align-reference-type"
 msgid "Image"
 msgstr "画像"
 
-#: ../app/core/core-enums.c:466
+#: ../app/core/core-enums.c:501
 msgctxt "align-reference-type"
 msgid "Selection"
 msgstr "選択範囲"
 
-#: ../app/core/core-enums.c:467
+#: ../app/core/core-enums.c:502
 msgctxt "align-reference-type"
 msgid "Active layer"
 msgstr "アクティブなレイヤー"
 
-#: ../app/core/core-enums.c:468
+#: ../app/core/core-enums.c:503
 msgctxt "align-reference-type"
 msgid "Active channel"
 msgstr "アクティブなチャンネル"
 
-#: ../app/core/core-enums.c:469
+#: ../app/core/core-enums.c:504
 msgctxt "align-reference-type"
 msgid "Active path"
 msgstr "アクティブなパス"
 
-#: ../app/core/core-enums.c:501
+#: ../app/core/core-enums.c:536
 msgctxt "fill-type"
 msgid "Foreground color"
 msgstr "描画色"
 
-#: ../app/core/core-enums.c:502
+#: ../app/core/core-enums.c:537
 msgctxt "fill-type"
 msgid "Background color"
 msgstr "背景色"
 
-#: ../app/core/core-enums.c:503
+#: ../app/core/core-enums.c:538
 msgctxt "fill-type"
 msgid "White"
 msgstr "白"
 
-#: ../app/core/core-enums.c:504
+#: ../app/core/core-enums.c:539
 msgctxt "fill-type"
 msgid "Transparency"
 msgstr "透明"
 
-#: ../app/core/core-enums.c:505
+#: ../app/core/core-enums.c:540
 msgctxt "fill-type"
 msgid "Pattern"
 msgstr "パターン"
 
-#: ../app/core/core-enums.c:506
+#: ../app/core/core-enums.c:541
 msgctxt "fill-type"
 msgid "None"
 msgstr "なし (fill-type)"
 
-#: ../app/core/core-enums.c:534
+#: ../app/core/core-enums.c:569
 msgctxt "fill-style"
 msgid "Solid color"
 msgstr "描画色"
 
-#: ../app/core/core-enums.c:535
+#: ../app/core/core-enums.c:570
 msgctxt "fill-style"
 msgid "Pattern"
 msgstr "パターン"
 
-#: ../app/core/core-enums.c:563
+#: ../app/core/core-enums.c:598
 msgctxt "stroke-method"
 msgid "Stroke line"
 msgstr "線スタイルを設定して描画"
 
-#: ../app/core/core-enums.c:564
+#: ../app/core/core-enums.c:599
 msgctxt "stroke-method"
 msgid "Stroke with a paint tool"
 msgstr "描画ツールを使用"
 
-#: ../app/core/core-enums.c:593
+#: ../app/core/core-enums.c:628
 msgctxt "join-style"
 msgid "Miter"
 msgstr "斜め継ぎ"
 
-#: ../app/core/core-enums.c:594
+#: ../app/core/core-enums.c:629
 msgctxt "join-style"
 msgid "Round"
 msgstr "丸め"
 
-#: ../app/core/core-enums.c:595
+#: ../app/core/core-enums.c:630
 msgctxt "join-style"
 msgid "Bevel"
 msgstr "面取り"
 
-#: ../app/core/core-enums.c:624
+#: ../app/core/core-enums.c:659
 msgctxt "cap-style"
 msgid "Butt"
 msgstr "端で止める"
 
-#: ../app/core/core-enums.c:625
+#: ../app/core/core-enums.c:660
 msgctxt "cap-style"
 msgid "Round"
 msgstr "端を中心にして丸め"
 
-#: ../app/core/core-enums.c:626
+#: ../app/core/core-enums.c:661
 msgctxt "cap-style"
 msgid "Square"
 msgstr "端を中心にして四角形"
 
-#: ../app/core/core-enums.c:663
+#: ../app/core/core-enums.c:698
 msgctxt "dash-preset"
 msgid "Custom"
 msgstr "カスタム"
 
-#: ../app/core/core-enums.c:664
+#: ../app/core/core-enums.c:699
 msgctxt "dash-preset"
 msgid "Line"
 msgstr "直線"
 
-#: ../app/core/core-enums.c:665
+#: ../app/core/core-enums.c:700
 msgctxt "dash-preset"
 msgid "Long dashes"
 msgstr "長破線"
 
-#: ../app/core/core-enums.c:666
+#: ../app/core/core-enums.c:701
 msgctxt "dash-preset"
 msgid "Medium dashes"
 msgstr "中破線"
 
-#: ../app/core/core-enums.c:667
+#: ../app/core/core-enums.c:702
 msgctxt "dash-preset"
 msgid "Short dashes"
 msgstr "短破線"
 
-#: ../app/core/core-enums.c:668
+#: ../app/core/core-enums.c:703
 msgctxt "dash-preset"
 msgid "Sparse dots"
 msgstr "広間点"
 
-#: ../app/core/core-enums.c:669
+#: ../app/core/core-enums.c:704
 msgctxt "dash-preset"
 msgid "Normal dots"
 msgstr "点"
 
-#: ../app/core/core-enums.c:670
+#: ../app/core/core-enums.c:705
 msgctxt "dash-preset"
 msgid "Dense dots"
 msgstr "密点"
 
-#: ../app/core/core-enums.c:671
+#: ../app/core/core-enums.c:706
 msgctxt "dash-preset"
 msgid "Stipples"
 msgstr "点描"
 
-#: ../app/core/core-enums.c:672
+#: ../app/core/core-enums.c:707
 msgctxt "dash-preset"
 msgid "Dash, dot"
 msgstr "一点鎖線"
 
-#: ../app/core/core-enums.c:673
+#: ../app/core/core-enums.c:708
 msgctxt "dash-preset"
 msgid "Dash, dot, dot"
 msgstr "二点鎖線"
 
-#: ../app/core/core-enums.c:702
+#: ../app/core/core-enums.c:737
 msgctxt "brush-generated-shape"
 msgid "Circle"
 msgstr "丸みを帯びた先端"
 
 # 表記揺れではない
 # ブラシエディターで [とがりの数] を 4 以外にして確認せよ
-#: ../app/core/core-enums.c:703
+#: ../app/core/core-enums.c:738
 msgctxt "brush-generated-shape"
 msgid "Square"
 msgstr "フラットな先端"
 
 # 表記揺れではない
 # ブラシエディターで [とがりの数] を 4 以上にして確認せよ
-#: ../app/core/core-enums.c:704
+#: ../app/core/core-enums.c:739
 msgctxt "brush-generated-shape"
 msgid "Diamond"
 msgstr "とがった先端"
 
-#: ../app/core/core-enums.c:733
+#: ../app/core/core-enums.c:768
 msgctxt "orientation-type"
 msgid "Horizontal"
 msgstr "水平"
 
-#: ../app/core/core-enums.c:734
+#: ../app/core/core-enums.c:769
 msgctxt "orientation-type"
 msgid "Vertical"
 msgstr "垂直"
 
-#: ../app/core/core-enums.c:735
+#: ../app/core/core-enums.c:770
 msgctxt "orientation-type"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../app/core/core-enums.c:766
+#: ../app/core/core-enums.c:806
 msgctxt "precision"
-msgid "8-bit integer"
+msgid "8-bit linear integer"
 msgstr ""
 
-#: ../app/core/core-enums.c:767
+#: ../app/core/core-enums.c:807
 msgctxt "precision"
-msgid "16-bit integer"
+msgid "8-bit gamma integer"
 msgstr ""
 
-#: ../app/core/core-enums.c:768
+#: ../app/core/core-enums.c:808
 msgctxt "precision"
-msgid "32-bit integer"
+msgid "16-bit linear integer"
 msgstr ""
 
-#: ../app/core/core-enums.c:769
+#: ../app/core/core-enums.c:809
 msgctxt "precision"
-msgid "16-bit floating point"
+msgid "16-bit gamma integer"
 msgstr ""
 
-#: ../app/core/core-enums.c:770
+#: ../app/core/core-enums.c:810
 msgctxt "precision"
-msgid "32-bit floating point"
+msgid "32-bit linear integer"
+msgstr ""
+
+#: ../app/core/core-enums.c:811
+msgctxt "precision"
+msgid "32-bit gamma integer"
 msgstr ""
 
-#: ../app/core/core-enums.c:801
+#: ../app/core/core-enums.c:812
+msgctxt "precision"
+msgid "16-bit linear floating point"
+msgstr ""
+
+#: ../app/core/core-enums.c:813
+msgctxt "precision"
+msgid "16-bit gamma floating point"
+msgstr ""
+
+#: ../app/core/core-enums.c:814
+msgctxt "precision"
+msgid "32-bit linear floating point"
+msgstr ""
+
+#: ../app/core/core-enums.c:815
+msgctxt "precision"
+msgid "32-bit gamma floating point"
+msgstr ""
+
+#: ../app/core/core-enums.c:846
 msgctxt "item-set"
 msgid "None"
 msgstr "なし"
 
-#: ../app/core/core-enums.c:802
+#: ../app/core/core-enums.c:847
 msgctxt "item-set"
 msgid "All layers"
 msgstr "すべてのレイヤー"
 
-#: ../app/core/core-enums.c:803
+#: ../app/core/core-enums.c:848
 msgctxt "item-set"
 msgid "Image-sized layers"
 msgstr "キャンバスサイズのレイヤー"
 
-#: ../app/core/core-enums.c:804
+#: ../app/core/core-enums.c:849
 msgctxt "item-set"
 msgid "All visible layers"
 msgstr "すべての可視レイヤー"
 
-#: ../app/core/core-enums.c:805
+#: ../app/core/core-enums.c:850
 msgctxt "item-set"
 msgid "All linked layers"
 msgstr "すべての連結されたレイヤー"
 
-#: ../app/core/core-enums.c:871
+#: ../app/core/core-enums.c:916
 msgctxt "view-size"
 msgid "Tiny"
 msgstr "微小"
 
-#: ../app/core/core-enums.c:872
+#: ../app/core/core-enums.c:917
 msgctxt "view-size"
 msgid "Very small"
 msgstr "さらに小さい"
 
-#: ../app/core/core-enums.c:873
+#: ../app/core/core-enums.c:918
 msgctxt "view-size"
 msgid "Small"
 msgstr "小さい"
 
-#: ../app/core/core-enums.c:874
+#: ../app/core/core-enums.c:919
 msgctxt "view-size"
 msgid "Medium"
 msgstr "中間"
 
-#: ../app/core/core-enums.c:875
+#: ../app/core/core-enums.c:920
 msgctxt "view-size"
 msgid "Large"
 msgstr "大きい"
 
-#: ../app/core/core-enums.c:876
+#: ../app/core/core-enums.c:921
 msgctxt "view-size"
 msgid "Very large"
 msgstr "さらに大きい"
 
-#: ../app/core/core-enums.c:877
+#: ../app/core/core-enums.c:922
 msgctxt "view-size"
 msgid "Huge"
 msgstr "とても大きい"
 
-#: ../app/core/core-enums.c:878
+#: ../app/core/core-enums.c:923
 msgctxt "view-size"
 msgid "Enormous"
 msgstr "巨大"
 
-#: ../app/core/core-enums.c:879
+#: ../app/core/core-enums.c:924
 msgctxt "view-size"
 msgid "Gigantic"
 msgstr "超巨大"
 
-#: ../app/core/core-enums.c:907
+#: ../app/core/core-enums.c:952
 msgctxt "view-type"
 msgid "View as list"
 msgstr "リストで表示"
 
-#: ../app/core/core-enums.c:908
+#: ../app/core/core-enums.c:953
 msgctxt "view-type"
 msgid "View as grid"
 msgstr "グリッドで表示"
 
-#: ../app/core/core-enums.c:937
+#: ../app/core/core-enums.c:982
 msgctxt "thumbnail-size"
 msgid "No thumbnails"
 msgstr "サムネイルなし"
 
-#: ../app/core/core-enums.c:938
+#: ../app/core/core-enums.c:983
 msgctxt "thumbnail-size"
 msgid "Normal (128x128)"
 msgstr "標準 (128x128)"
 
-#: ../app/core/core-enums.c:939
+#: ../app/core/core-enums.c:984
 msgctxt "thumbnail-size"
 msgid "Large (256x256)"
 msgstr "大 (256x256)"
 
-#: ../app/core/core-enums.c:1117
+#: ../app/core/core-enums.c:1166
 msgctxt "undo-type"
 msgid "<<invalid>>"
 msgstr "<<不正>>"
 
-#: ../app/core/core-enums.c:1118
+#: ../app/core/core-enums.c:1167
 msgctxt "undo-type"
 msgid "Scale image"
 msgstr "画像の拡大・縮小"
 
-#: ../app/core/core-enums.c:1119
+#: ../app/core/core-enums.c:1168
 msgctxt "undo-type"
 msgid "Resize image"
 msgstr "キャンバスサイズの変更"
 
-#: ../app/core/core-enums.c:1120
+#: ../app/core/core-enums.c:1169
 msgctxt "undo-type"
 msgid "Flip image"
 msgstr "画像の反転"
 
-#: ../app/core/core-enums.c:1121
+#: ../app/core/core-enums.c:1170
 msgctxt "undo-type"
 msgid "Rotate image"
 msgstr "画像の回転"
 
-#: ../app/core/core-enums.c:1122
+#: ../app/core/core-enums.c:1171
 msgctxt "undo-type"
 msgid "Crop image"
 msgstr "画像の切り抜き"
 
-#: ../app/core/core-enums.c:1123
+#: ../app/core/core-enums.c:1172
 msgctxt "undo-type"
 msgid "Convert image"
 msgstr "画像の変換"
 
-#: ../app/core/core-enums.c:1124
+#: ../app/core/core-enums.c:1173
 msgctxt "undo-type"
 msgid "Remove item"
 msgstr "アイテムの削除"
 
-#: ../app/core/core-enums.c:1125
+#: ../app/core/core-enums.c:1174
 msgctxt "undo-type"
 msgid "Merge layers"
 msgstr "レイヤーの統合"
 
-#: ../app/core/core-enums.c:1126
+#: ../app/core/core-enums.c:1175
 msgctxt "undo-type"
 msgid "Merge paths"
 msgstr "パスの結合"
 
-#: ../app/core/core-enums.c:1127
+#: ../app/core/core-enums.c:1176
 msgctxt "undo-type"
 msgid "Quick Mask"
 msgstr "クイックマスク"
 
-#: ../app/core/core-enums.c:1128 ../app/core/core-enums.c:1159
-#: ../app/core/gimpimage-grid.c:63
+#: ../app/core/core-enums.c:1177 ../app/core/core-enums.c:1208
+#: ../app/core/gimpimage-grid.c:64
 msgctxt "undo-type"
 msgid "Grid"
 msgstr "グリッド"
 
-#: ../app/core/core-enums.c:1129 ../app/core/core-enums.c:1161
+#: ../app/core/core-enums.c:1178 ../app/core/core-enums.c:1211
 msgctxt "undo-type"
 msgid "Guide"
 msgstr "ガイド"
 
-#: ../app/core/core-enums.c:1130 ../app/core/core-enums.c:1162
+#: ../app/core/core-enums.c:1179 ../app/core/core-enums.c:1212
 msgctxt "undo-type"
 msgid "Sample Point"
 msgstr "サンプルポイント"
 
-#: ../app/core/core-enums.c:1131 ../app/core/core-enums.c:1163
+#: ../app/core/core-enums.c:1180 ../app/core/core-enums.c:1213
 msgctxt "undo-type"
 msgid "Layer/Channel"
 msgstr "レイヤー/チャンネル"
 
-#: ../app/core/core-enums.c:1132 ../app/core/core-enums.c:1164
+#: ../app/core/core-enums.c:1181 ../app/core/core-enums.c:1214
 msgctxt "undo-type"
 msgid "Layer/Channel modification"
 msgstr "レイヤー /チャンネルの変更"
 
-#: ../app/core/core-enums.c:1133 ../app/core/core-enums.c:1165
+#: ../app/core/core-enums.c:1182 ../app/core/core-enums.c:1215
 msgctxt "undo-type"
 msgid "Selection mask"
 msgstr "選択マスク"
 
-#: ../app/core/core-enums.c:1134 ../app/core/core-enums.c:1169
+#: ../app/core/core-enums.c:1183 ../app/core/core-enums.c:1219
 msgctxt "undo-type"
 msgid "Item visibility"
 msgstr "アイテムの表示"
 
-#: ../app/core/core-enums.c:1135 ../app/core/core-enums.c:1170
+#: ../app/core/core-enums.c:1184 ../app/core/core-enums.c:1220
 msgctxt "undo-type"
 msgid "Link/Unlink item"
 msgstr "アイテムの連結/連結解除"
 
-#: ../app/core/core-enums.c:1136
+#: ../app/core/core-enums.c:1185
 msgctxt "undo-type"
 msgid "Item properties"
 msgstr "アイテムのプロパティ"
 
-#: ../app/core/core-enums.c:1137 ../app/core/core-enums.c:1168
+#: ../app/core/core-enums.c:1186 ../app/core/core-enums.c:1218
 msgctxt "undo-type"
 msgid "Move item"
 msgstr "アイテムの移動"
 
-#: ../app/core/core-enums.c:1138
+#: ../app/core/core-enums.c:1187
 msgctxt "undo-type"
 msgid "Scale item"
 msgstr "アイテムの拡大・縮小"
 
-#: ../app/core/core-enums.c:1139
+#: ../app/core/core-enums.c:1188
 msgctxt "undo-type"
 msgid "Resize item"
 msgstr "アイテムのサイズ変更"
 
-#: ../app/core/core-enums.c:1140
+#: ../app/core/core-enums.c:1189
 msgctxt "undo-type"
 msgid "Add layer"
 msgstr "レイヤーの追加"
 
-#: ../app/core/core-enums.c:1141 ../app/core/core-enums.c:1181
+#: ../app/core/core-enums.c:1190 ../app/core/core-enums.c:1234
 msgctxt "undo-type"
 msgid "Add layer mask"
 msgstr "レイヤーマスクの追加"
 
-#: ../app/core/core-enums.c:1142 ../app/core/core-enums.c:1183
+#: ../app/core/core-enums.c:1191 ../app/core/core-enums.c:1236
 msgctxt "undo-type"
 msgid "Apply layer mask"
 msgstr "レイヤーマスクの適用"
 
-#: ../app/core/core-enums.c:1143 ../app/core/core-enums.c:1191
+#: ../app/core/core-enums.c:1192 ../app/core/core-enums.c:1244
 msgctxt "undo-type"
 msgid "Floating selection to layer"
 msgstr "フローティング選択範囲をレイヤーに"
 
-#: ../app/core/core-enums.c:1144
+#: ../app/core/core-enums.c:1193
 msgctxt "undo-type"
 msgid "Float selection"
 msgstr "フローティング選択範囲"
 
-#: ../app/core/core-enums.c:1145
+#: ../app/core/core-enums.c:1194
 msgctxt "undo-type"
 msgid "Anchor floating selection"
 msgstr "フローティング選択範囲の固定"
 
-#: ../app/core/core-enums.c:1146 ../app/core/gimp-edit.c:256
+#: ../app/core/core-enums.c:1195 ../app/core/gimp-edit.c:285
 msgctxt "undo-type"
 msgid "Paste"
 msgstr "貼り付け"
 
-#: ../app/core/core-enums.c:1147 ../app/core/gimp-edit.c:572
+#: ../app/core/core-enums.c:1196 ../app/core/gimp-edit.c:602
 msgctxt "undo-type"
 msgid "Cut"
 msgstr "切り取り"
 
-#: ../app/core/core-enums.c:1148
+#: ../app/core/core-enums.c:1197
 msgctxt "undo-type"
 msgid "Text"
 msgstr "テキスト"
 
-#: ../app/core/core-enums.c:1149 ../app/core/core-enums.c:1192
-#: ../app/core/gimpdrawable-transform.c:658
+#: ../app/core/core-enums.c:1198 ../app/core/core-enums.c:1245
+#: ../app/core/gimpdrawable-transform.c:636
 msgctxt "undo-type"
 msgid "Transform"
 msgstr "変形"
 
-#: ../app/core/core-enums.c:1150 ../app/core/core-enums.c:1193
+#: ../app/core/core-enums.c:1199 ../app/core/core-enums.c:1246
 msgctxt "undo-type"
 msgid "Paint"
 msgstr "描画"
 
-#: ../app/core/core-enums.c:1151 ../app/core/core-enums.c:1196
+#: ../app/core/core-enums.c:1200 ../app/core/core-enums.c:1249
 msgctxt "undo-type"
 msgid "Attach parasite"
 msgstr "パラサイトの付加"
 
-#: ../app/core/core-enums.c:1152 ../app/core/core-enums.c:1197
+#: ../app/core/core-enums.c:1201 ../app/core/core-enums.c:1250
 msgctxt "undo-type"
 msgid "Remove parasite"
 msgstr "パラサイトの削除"
 
-#: ../app/core/core-enums.c:1153
+#: ../app/core/core-enums.c:1202
 msgctxt "undo-type"
 msgid "Import paths"
 msgstr "パスのインポート"
 
-#: ../app/core/core-enums.c:1154
+#: ../app/core/core-enums.c:1203
 msgctxt "undo-type"
 msgid "Plug-In"
 msgstr "プラグイン"
 
-#: ../app/core/core-enums.c:1155
+#: ../app/core/core-enums.c:1204
 msgctxt "undo-type"
 msgid "Image type"
 msgstr "画像の種類"
 
-#: ../app/core/core-enums.c:1156
+#: ../app/core/core-enums.c:1205
 #, fuzzy
+#| msgid "Image Properties"
 msgctxt "undo-type"
 msgid "Image precision"
 msgstr "画像の情報"
 
-#: ../app/core/core-enums.c:1157
+#: ../app/core/core-enums.c:1206
 msgctxt "undo-type"
 msgid "Image size"
 msgstr "キャンバスサイズ"
 
-#: ../app/core/core-enums.c:1158
+#: ../app/core/core-enums.c:1207
 msgctxt "undo-type"
 msgid "Image resolution change"
 msgstr "解像度の変更"
 
-#: ../app/core/core-enums.c:1160
+#: ../app/core/core-enums.c:1209
+#, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Change Image Unit"
+msgctxt "undo-type"
+msgid "Change metadata"
+msgstr "画像単位の変更"
+
+#: ../app/core/core-enums.c:1210
 msgctxt "undo-type"
 msgid "Change indexed palette"
 msgstr "インデックスパレットの変更"
 
-#: ../app/core/core-enums.c:1166
+#: ../app/core/core-enums.c:1216
 msgctxt "undo-type"
 msgid "Reorder item"
 msgstr "アイテムの並べ替え"
 
-#: ../app/core/core-enums.c:1167
+#: ../app/core/core-enums.c:1217
 msgctxt "undo-type"
 msgid "Rename item"
 msgstr "アイテム名の変更"
 
-#: ../app/core/core-enums.c:1171
+#: ../app/core/core-enums.c:1221
+#, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Lock/Unlock alpha channel"
+msgctxt "undo-type"
+msgid "Lock/Unlock content"
+msgstr "透明保護/保護解除"
+
+#: ../app/core/core-enums.c:1222
+#, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Lock/Unlock alpha channel"
+msgctxt "undo-type"
+msgid "Lock/Unlock position"
+msgstr "透明保護/保護解除"
+
+#: ../app/core/core-enums.c:1223
 msgctxt "undo-type"
 msgid "New layer"
 msgstr "新しいレイヤーの追加"
 
-#: ../app/core/core-enums.c:1172
+#: ../app/core/core-enums.c:1224
 msgctxt "undo-type"
 msgid "Delete layer"
 msgstr "レイヤーの削除"
 
-#: ../app/core/core-enums.c:1173
+#: ../app/core/core-enums.c:1225
 msgctxt "undo-type"
 msgid "Set layer mode"
 msgstr "レイヤーモードの設定"
 
-#: ../app/core/core-enums.c:1174
+#: ../app/core/core-enums.c:1226
 msgctxt "undo-type"
 msgid "Set layer opacity"
 msgstr "レイヤー不透明度の設定"
 
-#: ../app/core/core-enums.c:1175
+#: ../app/core/core-enums.c:1227
 msgctxt "undo-type"
 msgid "Lock/Unlock alpha channel"
 msgstr "透明保護/保護解除"
 
-#: ../app/core/core-enums.c:1176
+#: ../app/core/core-enums.c:1228
 msgctxt "undo-type"
 msgid "Suspend group layer resize"
 msgstr "グループレイヤーのサイズ変更を中断"
 
-#: ../app/core/core-enums.c:1177
+#: ../app/core/core-enums.c:1229
 msgctxt "undo-type"
 msgid "Resume group layer resize"
 msgstr "グループレイヤーのサイズ変更を再開"
 
-#: ../app/core/core-enums.c:1178
+#: ../app/core/core-enums.c:1230
 msgctxt "undo-type"
 msgid "Convert group layer"
 msgstr "グループレイヤーを変換"
 
-#: ../app/core/core-enums.c:1179
+#: ../app/core/core-enums.c:1231
 msgctxt "undo-type"
 msgid "Text layer"
 msgstr "テキストレイヤー"
 
-#: ../app/core/core-enums.c:1180
+#: ../app/core/core-enums.c:1232
 msgctxt "undo-type"
 msgid "Text layer modification"
 msgstr "テキストレイヤーの変更"
 
-#: ../app/core/core-enums.c:1182
+#: ../app/core/core-enums.c:1233
+#, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Convert group layer"
+msgctxt "undo-type"
+msgid "Convert text layer"
+msgstr "グループレイヤーを変換"
+
+#: ../app/core/core-enums.c:1235
 msgctxt "undo-type"
 msgid "Delete layer mask"
 msgstr "レイヤーマスクの削除"
 
-#: ../app/core/core-enums.c:1184
+#: ../app/core/core-enums.c:1237
 msgctxt "undo-type"
 msgid "Show layer mask"
 msgstr "レイヤーマスクの表示"
 
-#: ../app/core/core-enums.c:1185
+#: ../app/core/core-enums.c:1238
 msgctxt "undo-type"
 msgid "New channel"
 msgstr "新しいチャンネルの追加"
 
-#: ../app/core/core-enums.c:1186
+#: ../app/core/core-enums.c:1239
 msgctxt "undo-type"
 msgid "Delete channel"
 msgstr "チャンネルの削除"
 
-#: ../app/core/core-enums.c:1187
+#: ../app/core/core-enums.c:1240
 msgctxt "undo-type"
 msgid "Channel color"
 msgstr "チャンネル表示色"
 
-#: ../app/core/core-enums.c:1188
+#: ../app/core/core-enums.c:1241
 msgctxt "undo-type"
 msgid "New path"
 msgstr "新しいパス"
 
-#: ../app/core/core-enums.c:1189
+#: ../app/core/core-enums.c:1242
 msgctxt "undo-type"
 msgid "Delete path"
 msgstr "パスを削除"
 
-#: ../app/core/core-enums.c:1190
+#: ../app/core/core-enums.c:1243
 msgctxt "undo-type"
 msgid "Path modification"
 msgstr "パスの修正"
 
-#: ../app/core/core-enums.c:1194
+#: ../app/core/core-enums.c:1247
 msgctxt "undo-type"
 msgid "Ink"
 msgstr "インクで描画"
 
-#: ../app/core/core-enums.c:1195
+#: ../app/core/core-enums.c:1248
 msgctxt "undo-type"
 msgid "Select foreground"
 msgstr "前景抽出選択"
 
-#: ../app/core/core-enums.c:1198
+#: ../app/core/core-enums.c:1251
 msgctxt "undo-type"
 msgid "Not undoable"
 msgstr "元に戻せません"
 
-#: ../app/core/core-enums.c:1470
+#: ../app/core/core-enums.c:1525
 msgctxt "select-criterion"
 msgid "Composite"
 msgstr "コンポジット"
 
-#: ../app/core/core-enums.c:1471
+#: ../app/core/core-enums.c:1526
 msgctxt "select-criterion"
 msgid "Red"
 msgstr "赤"
 
-#: ../app/core/core-enums.c:1472
+#: ../app/core/core-enums.c:1527
 msgctxt "select-criterion"
 msgid "Green"
 msgstr "緑"
 
-#: ../app/core/core-enums.c:1473
+#: ../app/core/core-enums.c:1528
 msgctxt "select-criterion"
 msgid "Blue"
 msgstr "青"
 
-#: ../app/core/core-enums.c:1474
+#: ../app/core/core-enums.c:1529
 msgctxt "select-criterion"
 msgid "Hue"
 msgstr "色相"
 
-#: ../app/core/core-enums.c:1475
+#: ../app/core/core-enums.c:1530
 msgctxt "select-criterion"
 msgid "Saturation"
 msgstr "彩度"
 
-#: ../app/core/core-enums.c:1476
+#: ../app/core/core-enums.c:1531
 msgctxt "select-criterion"
 msgid "Value"
 msgstr "明度"
 
-#: ../app/core/core-enums.c:1505
+#: ../app/core/core-enums.c:1560
 msgctxt "message-severity"
 msgid "Message"
 msgstr "メッセージ"
 
-#: ../app/core/core-enums.c:1506
+#: ../app/core/core-enums.c:1561
 msgctxt "message-severity"
 msgid "Warning"
 msgstr "警告"
 
-#: ../app/core/core-enums.c:1507
+#: ../app/core/core-enums.c:1562
 msgctxt "message-severity"
 msgid "Error"
 msgstr "エラー"
 
-#: ../app/core/core-enums.c:1536
+#: ../app/core/core-enums.c:1591
 msgctxt "color-profile-policy"
 msgid "Ask what to do"
 msgstr "どうするか確認"
 
-#: ../app/core/core-enums.c:1537
+#: ../app/core/core-enums.c:1592
 msgctxt "color-profile-policy"
 msgid "Keep embedded profile"
 msgstr "埋め込まれているプロファイルを使う"
 
-#: ../app/core/core-enums.c:1538
+#: ../app/core/core-enums.c:1593
 msgctxt "color-profile-policy"
 msgid "Convert to RGB workspace"
 msgstr "RGB 作業用スペースに変換"
 
-#: ../app/core/core-enums.c:1575
+#: ../app/core/core-enums.c:1630
 msgctxt "dynamics-output-type"
 msgid "Opacity"
 msgstr "不透明度"
 
-#: ../app/core/core-enums.c:1576
+#: ../app/core/core-enums.c:1631
 msgctxt "dynamics-output-type"
 msgid "Size"
 msgstr "サイズ"
 
-#: ../app/core/core-enums.c:1577
+#: ../app/core/core-enums.c:1632
 msgctxt "dynamics-output-type"
 msgid "Angle"
 msgstr "角度"
 
-#: ../app/core/core-enums.c:1578
+#: ../app/core/core-enums.c:1633
 msgctxt "dynamics-output-type"
 msgid "Color"
 msgstr "色"
 
-#: ../app/core/core-enums.c:1579
+#: ../app/core/core-enums.c:1634
 msgctxt "dynamics-output-type"
 msgid "Hardness"
 msgstr "硬さ"
 
-#: ../app/core/core-enums.c:1580
+#: ../app/core/core-enums.c:1635
 msgctxt "dynamics-output-type"
 msgid "Force"
 msgstr "強さ"
 
-#: ../app/core/core-enums.c:1581
+#: ../app/core/core-enums.c:1636
 msgctxt "dynamics-output-type"
 msgid "Aspect ratio"
 msgstr "縦横比"
 
-#: ../app/core/core-enums.c:1582
+#: ../app/core/core-enums.c:1637
 msgctxt "dynamics-output-type"
 msgid "Spacing"
 msgstr "間隔"
 
-#: ../app/core/core-enums.c:1583
+#: ../app/core/core-enums.c:1638
 msgctxt "dynamics-output-type"
 msgid "Rate"
 msgstr "割合"
 
-#: ../app/core/core-enums.c:1584
+#: ../app/core/core-enums.c:1639
 msgctxt "dynamics-output-type"
 msgid "Flow"
 msgstr "流量"
 
-#: ../app/core/core-enums.c:1585
+#: ../app/core/core-enums.c:1640
 msgctxt "dynamics-output-type"
 msgid "Jitter"
 msgstr "散布"
 
-#: ../app/core/gimpbrush.c:147
+#: ../app/core/gimpbrush.c:148
 msgid "Brush Spacing"
 msgstr "ブラシの間隔"
 
-#: ../app/core/gimpbrushgenerated.c:128
+#: ../app/core/gimpbrushgenerated.c:129
 msgid "Brush Shape"
 msgstr "ブラシ形状"
 
-#: ../app/core/gimpbrushgenerated.c:136
+#: ../app/core/gimpbrushgenerated.c:137
 msgid "Brush Radius"
 msgstr "ブラシ半径"
 
-#: ../app/core/gimpbrushgenerated.c:143
+#: ../app/core/gimpbrushgenerated.c:144
 msgid "Brush Spikes"
 msgstr "ブラシのとがり数"
 
-#: ../app/core/gimpbrushgenerated.c:150
+#: ../app/core/gimpbrushgenerated.c:151
 msgid "Brush Hardness"
 msgstr "ブラシ強度"
 
-#: ../app/core/gimpbrushgenerated.c:158 ../app/paint/gimppaintoptions.c:150
+#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:160
 msgid "Brush Aspect Ratio"
 msgstr "ブラシの縦横比を指定します"
 
-#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:154
+#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:164
 msgid "Brush Angle"
 msgstr "ブラシの角度を指定します"
 
-#: ../app/core/gimpbrushgenerated-load.c:85
+#: ../app/core/gimpbrushgenerated-load.c:86
 #, c-format
 msgid "Fatal parse error in brush file '%s': Not a GIMP brush file."
 msgstr "ブラシ '%s' で致命的な解析エラー: GIMP ブラシファイルではありません。"
 
-#: ../app/core/gimpbrushgenerated-load.c:102
+#: ../app/core/gimpbrushgenerated-load.c:103
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d."
@@ -7655,80 +8286,80 @@ msgstr ""
 "ブラシ '%s' で致命的な解析エラー: 不明な GIMP ブラシファイルのバージョンです"
 "(%d行目)。"
 
-#: ../app/core/gimpbrushgenerated-load.c:126 ../app/core/gimpbrush-load.c:278
-#: ../app/core/gimpbrushpipe-load.c:95
+#: ../app/core/gimpbrushgenerated-load.c:127 ../app/core/gimpbrush-load.c:281
+#: ../app/core/gimpbrushpipe-load.c:96
 #, c-format
 msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "ブラシファイル '%s' 中に不適切な UTF-8 文字列があります。"
 
-#: ../app/core/gimpbrushgenerated-load.c:148
+#: ../app/core/gimpbrushgenerated-load.c:149
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d."
 msgstr ""
 "ブラシ '%s' で致命的な解析エラー: 不明な GIMP ブラシの形状です。(%d行目)"
 
-#: ../app/core/gimpbrushgenerated-load.c:224
+#: ../app/core/gimpbrushgenerated-load.c:225
 #, c-format
 msgid "Line %d: %s"
 msgstr "%d行目: %s"
 
-#: ../app/core/gimpbrushgenerated-load.c:226
+#: ../app/core/gimpbrushgenerated-load.c:227
 #, c-format
 msgid "File is truncated in line %d"
 msgstr "%d行目でファイルが切り詰められています。"
 
-#: ../app/core/gimpbrushgenerated-load.c:229
+#: ../app/core/gimpbrushgenerated-load.c:230
 #, c-format
 msgid "Error while reading brush file '%s': %s"
 msgstr ""
 "ブラシファイル '%s' 読み込み中にエラーが発生しました。\n"
 "%s"
 
-#: ../app/core/gimpbrush-load.c:177
+#: ../app/core/gimpbrush-load.c:180
 #, c-format
 msgid "Could not read %d byte from '%s': %s"
 msgid_plural "Could not read %d bytes from '%s': %s"
 msgstr[0] "'%2$s' から %1$d バイト読み込めません。%3$s"
 
-#: ../app/core/gimpbrush-load.c:199
+#: ../app/core/gimpbrush-load.c:202
 #, c-format
 msgid "Fatal parse error in brush file '%s': Width = 0."
 msgstr "ブラシ '%s' で致命的な解析エラー: 幅が 0 です。"
 
-#: ../app/core/gimpbrush-load.c:208
+#: ../app/core/gimpbrush-load.c:211
 #, c-format
 msgid "Fatal parse error in brush file '%s': Height = 0."
 msgstr "ブラシ '%s' で致命的な解析エラー: 高さが 0 です。"
 
-#: ../app/core/gimpbrush-load.c:217
+#: ../app/core/gimpbrush-load.c:220
 #, c-format
 msgid "Fatal parse error in brush file '%s': Bytes = 0."
 msgstr "ブラシ '%s' で致命的な解析エラー: サイズが 0 バイトです。"
 
-#: ../app/core/gimpbrush-load.c:241
+#: ../app/core/gimpbrush-load.c:244
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown depth %d."
 msgstr "ブラシ '%s' で致命的な解析エラー: %d は不明な深度です。"
 
-#: ../app/core/gimpbrush-load.c:254
+#: ../app/core/gimpbrush-load.c:257
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown version %d."
 msgstr "ブラシ '%s' で致命的な解析エラー: %d は不明なバージョンです。"
 
-#: ../app/core/gimpbrush-load.c:270 ../app/core/gimpbrush-load.c:391
-#: ../app/core/gimpbrush-load.c:726
+#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:394
+#: ../app/core/gimpbrush-load.c:729
 #, c-format
 msgid "Fatal parse error in brush file '%s': File appears truncated."
 msgstr "ブラシ '%s' で致命的な解析エラー: ファイルが切り詰められています。"
 
-#: ../app/core/gimpbrush-load.c:285 ../app/core/gimppattern-load.c:151
+#: ../app/core/gimpbrush-load.c:288 ../app/core/gimppattern-load.c:151
 #: ../app/dialogs/template-options-dialog.c:84
-#: ../app/tools/gimpvectortool.c:317
+#: ../app/tools/gimpvectortool.c:318
 msgid "Unnamed"
 msgstr "名前なし"
 
-#: ../app/core/gimpbrush-load.c:380
+#: ../app/core/gimpbrush-load.c:383
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': Unsupported brush depth %d\n"
@@ -7738,7 +8369,7 @@ msgstr ""
 "す。\n"
 "GIMP ブラシは グレースケールか、RGBA でなければなりません。"
 
-#: ../app/core/gimpbrush-load.c:452
+#: ../app/core/gimpbrush-load.c:455 ../app/core/gimpbrush-load.c:857
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': unable to decode abr format version %d."
@@ -7746,232 +8377,231 @@ msgstr ""
 "ブラシ '%s' で致命的な解析エラー: abr フォーマットバージョン %d はデコードで"
 "きません。"
 
-#: ../app/core/gimpbrush-load.c:619
+#: ../app/core/gimpbrush-load.c:622
 #, c-format
 msgid "Fatal parse error in brush file '%s': Wide brushes are not supported."
 msgstr "ブラシ '%s' で致命的な解析エラー: ワイドブラシはサポートされません。"
 
-#: ../app/core/gimpbrushpipe-load.c:111 ../app/core/gimpbrushpipe-load.c:131
-#: ../app/core/gimpbrushpipe-load.c:222
+#: ../app/core/gimpbrushpipe-load.c:112 ../app/core/gimpbrushpipe-load.c:132
 #, c-format
 msgid "Fatal parse error in brush file '%s': File is corrupt."
 msgstr ""
 "ブラシファイル '%s' の解析中に致命的なエラーが発生しました。そのファイルは壊"
 "れています。"
 
-#: ../app/core/gimp.c:595
+#: ../app/core/gimp.c:604
 msgid "Initialization"
 msgstr "初期化中"
 
 #. register all internal procedures
-#: ../app/core/gimp.c:696
+#: ../app/core/gimp.c:705
 msgid "Internal Procedures"
 msgstr "内部プロシージャー"
 
 #. initialize  the global parasite table
-#: ../app/core/gimp.c:947
+#: ../app/core/gimp.c:960
 msgid "Looking for data files"
 msgstr "データファイルを検索中"
 
-#: ../app/core/gimp.c:947
+#: ../app/core/gimp.c:960
 msgid "Parasites"
 msgstr "パラサイト"
 
 #. initialize the list of gimp dynamics
-#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2744
-#: ../app/tools/gimppaintoptions-gui.c:204
+#: ../app/core/gimp.c:969 ../app/dialogs/preferences-dialog.c:2577
+#: ../app/tools/gimppaintoptions-gui.c:208
 msgid "Dynamics"
 msgstr "動的特性"
 
 #. initialize the list of fonts
-#: ../app/core/gimp.c:976
+#: ../app/core/gimp.c:989
 msgid "Fonts (this may take a while)"
 msgstr "フォント (しばらくお待ちください)"
 
 #. initialize the module list
-#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2776
+#: ../app/core/gimp.c:1006 ../app/dialogs/preferences-dialog.c:2609
 msgid "Modules"
 msgstr "モジュール"
 
 #. update tag cache
-#: ../app/core/gimp.c:997
+#: ../app/core/gimp.c:1010
 msgid "Updating tag cache"
 msgstr "タグキャッシュを更新"
 
-#: ../app/core/gimpchannel.c:271
+#: ../app/core/gimpchannel.c:275
 msgctxt "undo-type"
 msgid "Rename Channel"
 msgstr "チャンネル名の変更"
 
-#: ../app/core/gimpchannel.c:272
+#: ../app/core/gimpchannel.c:276
 msgctxt "undo-type"
 msgid "Move Channel"
 msgstr "チャンネルを移動"
 
-#: ../app/core/gimpchannel.c:273
+#: ../app/core/gimpchannel.c:277
 msgctxt "undo-type"
 msgid "Scale Channel"
 msgstr "チャンネルの拡大・縮小"
 
-#: ../app/core/gimpchannel.c:274
+#: ../app/core/gimpchannel.c:278
 msgctxt "undo-type"
 msgid "Resize Channel"
 msgstr "チャンネルのサイズ変更"
 
-#: ../app/core/gimpchannel.c:275
+#: ../app/core/gimpchannel.c:279
 msgctxt "undo-type"
 msgid "Flip Channel"
 msgstr "チャンネルを鏡像反転"
 
-#: ../app/core/gimpchannel.c:276
+#: ../app/core/gimpchannel.c:280
 msgctxt "undo-type"
 msgid "Rotate Channel"
 msgstr "チャンネルを回転"
 
-#: ../app/core/gimpchannel.c:277 ../app/core/gimpdrawable-transform.c:976
+#: ../app/core/gimpchannel.c:281 ../app/core/gimpdrawable-transform.c:952
 msgctxt "undo-type"
 msgid "Transform Channel"
 msgstr "チャンネルを変形"
 
-#: ../app/core/gimpchannel.c:278
+#: ../app/core/gimpchannel.c:282
 msgctxt "undo-type"
 msgid "Stroke Channel"
 msgstr "チャンネルにストローク"
 
-#: ../app/core/gimpchannel.c:279 ../app/core/gimpselection.c:579
+#: ../app/core/gimpchannel.c:283 ../app/core/gimpselection.c:614
 msgctxt "undo-type"
 msgid "Channel to Selection"
 msgstr "チャンネルを選択範囲に"
 
-#: ../app/core/gimpchannel.c:280
+#: ../app/core/gimpchannel.c:284
 msgctxt "undo-type"
 msgid "Reorder Channel"
 msgstr "チャンネルの並べ替え"
 
-#: ../app/core/gimpchannel.c:281
+#: ../app/core/gimpchannel.c:285
 msgctxt "undo-type"
 msgid "Raise Channel"
 msgstr "チャンネルを前面へ"
 
-#: ../app/core/gimpchannel.c:282
+#: ../app/core/gimpchannel.c:286
 msgctxt "undo-type"
 msgid "Raise Channel to Top"
 msgstr "チャンネルを最前面へ"
 
-#: ../app/core/gimpchannel.c:283
+#: ../app/core/gimpchannel.c:287
 msgctxt "undo-type"
 msgid "Lower Channel"
 msgstr "チャンネルを背面へ"
 
-#: ../app/core/gimpchannel.c:284
+#: ../app/core/gimpchannel.c:288
 msgctxt "undo-type"
 msgid "Lower Channel to Bottom"
 msgstr "チャンネルを最背面へ"
 
-#: ../app/core/gimpchannel.c:285
+#: ../app/core/gimpchannel.c:289
 msgid "Channel cannot be raised higher."
 msgstr "これ以上チャンネルを前面に移動させられません"
 
-#: ../app/core/gimpchannel.c:286
+#: ../app/core/gimpchannel.c:290
 msgid "Channel cannot be lowered more."
 msgstr "これ以上チャンネルを背面に移動させられません"
 
-#: ../app/core/gimpchannel.c:309
+#: ../app/core/gimpchannel.c:313
 msgctxt "undo-type"
 msgid "Feather Channel"
 msgstr "チャンネルをぼかす"
 
-#: ../app/core/gimpchannel.c:310
+#: ../app/core/gimpchannel.c:314
 msgctxt "undo-type"
 msgid "Sharpen Channel"
 msgstr "チャンネルをシャープに"
 
-#: ../app/core/gimpchannel.c:311
+#: ../app/core/gimpchannel.c:315
 msgctxt "undo-type"
 msgid "Clear Channel"
 msgstr "チャンネルをクリア"
 
-#: ../app/core/gimpchannel.c:312
+#: ../app/core/gimpchannel.c:316
 msgctxt "undo-type"
 msgid "Fill Channel"
 msgstr "チャンネルを塗りつぶす"
 
-#: ../app/core/gimpchannel.c:313
+#: ../app/core/gimpchannel.c:317
 msgctxt "undo-type"
 msgid "Invert Channel"
 msgstr "チャンネルの反転"
 
-#: ../app/core/gimpchannel.c:314
+#: ../app/core/gimpchannel.c:318
 msgctxt "undo-type"
 msgid "Border Channel"
 msgstr "チャンネルを縁取り"
 
-#: ../app/core/gimpchannel.c:315
+#: ../app/core/gimpchannel.c:319
 msgctxt "undo-type"
 msgid "Grow Channel"
 msgstr "チャンネルの拡大"
 
-#: ../app/core/gimpchannel.c:316
+#: ../app/core/gimpchannel.c:320
 msgctxt "undo-type"
 msgid "Shrink Channel"
 msgstr "チャンネルの縮小"
 
-#: ../app/core/gimpchannel.c:724
+#: ../app/core/gimpchannel.c:788
 msgid "Cannot stroke empty channel."
 msgstr "空のチャンネルはストロークできません。"
 
-#: ../app/core/gimpchannel.c:1759
+#: ../app/core/gimpchannel.c:1690
 msgctxt "undo-type"
 msgid "Set Channel Color"
 msgstr "チャンネル表示色の設定"
 
-#: ../app/core/gimpchannel.c:1818
+#: ../app/core/gimpchannel.c:1744
 msgctxt "undo-type"
 msgid "Set Channel Opacity"
 msgstr "チャンネル不透明度の設定"
 
-#: ../app/core/gimpchannel.c:1920 ../app/core/gimpselection.c:153
+#: ../app/core/gimpchannel.c:1841 ../app/core/gimpselection.c:161
 msgid "Selection Mask"
 msgstr "選択マスク"
 
-#: ../app/core/gimpchannel-select.c:60
+#: ../app/core/gimpchannel-select.c:64
 msgctxt "undo-type"
 msgid "Rectangle Select"
 msgstr "矩形選択"
 
-#: ../app/core/gimpchannel-select.c:111
+#: ../app/core/gimpchannel-select.c:116
 msgctxt "undo-type"
 msgid "Ellipse Select"
 msgstr "楕円選択"
 
-#: ../app/core/gimpchannel-select.c:165
+#: ../app/core/gimpchannel-select.c:171
 msgctxt "undo-type"
 msgid "Rounded Rectangle Select"
 msgstr "角を丸める"
 
-#: ../app/core/gimpchannel-select.c:408 ../app/core/gimplayer.c:298
+#: ../app/core/gimpchannel-select.c:438 ../app/core/gimplayer.c:309
 msgctxt "undo-type"
 msgid "Alpha to Selection"
 msgstr "不透明部分を選択範囲に"
 
-#: ../app/core/gimpchannel-select.c:446
+#: ../app/core/gimpchannel-select.c:476
 #, c-format
 msgctxt "undo-type"
 msgid "%s Channel to Selection"
 msgstr "%s チャンネルを選択範囲に"
 
-#: ../app/core/gimpchannel-select.c:494
+#: ../app/core/gimpchannel-select.c:524
 msgctxt "undo-type"
 msgid "Fuzzy Select"
 msgstr "ファジー選択"
 
-#: ../app/core/gimpchannel-select.c:541
+#: ../app/core/gimpchannel-select.c:571
 msgctxt "undo-type"
 msgid "Select by Color"
 msgstr "色域を選択"
 
-#: ../app/core/gimpcontext.c:640 ../app/tools/gimppaintoptions-gui.c:111
-#: ../app/widgets/gimpbrushselect.c:178 ../app/widgets/gimplayertreeview.c:284
+#: ../app/core/gimpcontext.c:640 ../app/tools/gimppaintoptions-gui.c:102
+#: ../app/widgets/gimpbrushselect.c:177 ../app/widgets/gimplayertreeview.c:286
 msgid "Opacity"
 msgstr "不透明度"
 
@@ -7979,24 +8609,24 @@ msgstr "不透明度"
 msgid "Paint Mode"
 msgstr "描画モードを指定します"
 
-#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375
-#: ../app/gui/session.c:399 ../app/menus/menus.c:468
-#: ../app/widgets/gimpdevices.c:207
+#: ../app/core/gimp-contexts.c:155 ../app/core/gimptooloptions.c:376
+#: ../app/gui/session.c:420 ../app/menus/menus.c:467
+#: ../app/widgets/gimpdevices.c:209
 #, c-format
 msgid "Deleting \"%s\" failed: %s"
 msgstr ""
 "'%s' の削除に失敗しました。\n"
 "%s"
 
-#: ../app/core/gimpdata.c:670
+#: ../app/core/gimpdata.c:690
 #, c-format
 msgid "Could not delete '%s': %s"
 msgstr ""
 "'%s' を削除できません。\n"
 "%s"
 
-#: ../app/core/gimpdatafactory.c:428 ../app/core/gimpdatafactory.c:457
-#: ../app/core/gimpdatafactory.c:623 ../app/core/gimpdatafactory.c:645
+#: ../app/core/gimpdatafactory.c:429 ../app/core/gimpdatafactory.c:458
+#: ../app/core/gimpdatafactory.c:624 ../app/core/gimpdatafactory.c:646
 #, c-format
 msgid ""
 "Failed to save data:\n"
@@ -8006,18 +8636,18 @@ msgstr ""
 "データ保存に失敗しました。\n"
 "%s"
 
-#: ../app/core/gimpdatafactory.c:537 ../app/core/gimpdatafactory.c:540
-#: ../app/core/gimpitem.c:493 ../app/core/gimpitem.c:496
+#: ../app/core/gimpdatafactory.c:538 ../app/core/gimpdatafactory.c:541
+#: ../app/core/gimpitem.c:523 ../app/core/gimpitem.c:526
 msgid "copy"
 msgstr "コピー"
 
-#: ../app/core/gimpdatafactory.c:549 ../app/core/gimpitem.c:505
+#: ../app/core/gimpdatafactory.c:550 ../app/core/gimpitem.c:535
 #, c-format
 msgid "%s copy"
 msgstr "%s コピー"
 
 # '%s' はフォルダー名を指す
-#: ../app/core/gimpdatafactory.c:742
+#: ../app/core/gimpdatafactory.c:751
 #, c-format
 msgid ""
 "You have a writable data folder configured (%s), but this folder does not "
@@ -8028,7 +8658,7 @@ msgstr ""
 "フォルダーを作成するか、設定ダイアログの [フォルダー] セクションでフォルダー"
 "を指定し直してください。"
 
-#: ../app/core/gimpdatafactory.c:763
+#: ../app/core/gimpdatafactory.c:772
 #, c-format
 msgid ""
 "You have a writable data folder configured, but this folder is not part of "
@@ -8039,12 +8669,12 @@ msgstr ""
 "更した場合、この現象が起こり得ます。) 設定ダイアログの [フォルダー] セクショ"
 "ンでフォルダーを指定し直してください。"
 
-#: ../app/core/gimpdatafactory.c:773
+#: ../app/core/gimpdatafactory.c:782
 #, c-format
 msgid "You don't have any writable data folder configured."
 msgstr "書き込み可能なデータフォルダーが設定されていません。"
 
-#: ../app/core/gimpdatafactory.c:937
+#: ../app/core/gimpdatafactory.c:946
 #, c-format
 msgid ""
 "Failed to load data:\n"
@@ -8054,17 +8684,17 @@ msgstr ""
 "データ読み込みに失敗しました。\n"
 "%s"
 
-#: ../app/core/gimpdrawable-blend.c:208
+#: ../app/core/gimpdrawable-blend.c:216
 msgctxt "undo-type"
 msgid "Blend"
 msgstr "ブレンド"
 
-#: ../app/core/gimpdrawable-blend.c:539
+#: ../app/core/gimpdrawable-blend.c:546
 msgid "Calculating distance map"
 msgstr ""
 
-#: ../app/core/gimpdrawable-blend.c:907 ../app/pdb/edit-cmds.c:758
-#: ../app/tools/gimpblendtool.c:242
+#: ../app/core/gimpdrawable-blend.c:941 ../app/pdb/edit-cmds.c:783
+#: ../app/tools/gimpblendtool.c:249
 msgid "Blending"
 msgstr "ブレンドしています..."
 
@@ -8072,26 +8702,28 @@ msgstr "ブレンドしています..."
 msgid "No patterns available for this operation."
 msgstr "有効なパターンがありません。"
 
-#: ../app/core/gimpdrawable-bucket-fill.c:264
+#: ../app/core/gimpdrawable-bucket-fill.c:259
 msgctxt "undo-type"
 msgid "Bucket Fill"
 msgstr "塗りつぶし"
 
-#: ../app/core/gimpdrawable.c:456
+#: ../app/core/gimpdrawable.c:525
 msgctxt "undo-type"
 msgid "Scale"
 msgstr "拡大・縮小"
 
-#: ../app/core/gimpdrawable-equalize.c:52
+#: ../app/core/gimpdrawable-equalize.c:53
 msgctxt "undo-type"
 msgid "Equalize"
 msgstr "平滑化"
 
-#: ../app/core/gimpdrawable-foreground-extract.c:132
+#: ../app/core/gimpdrawable-foreground-extract.c:140
 msgid "Foreground Extraction"
 msgstr "前景抽出選択"
 
-#: ../app/core/gimpdrawable-levels.c:71 ../app/tools/gimplevelstool.c:141
+#: ../app/core/gimpdrawable-levels.c:72
+#: ../app/tools/gimpforegroundselectoptions.c:312
+#: ../app/tools/gimplevelstool.c:136
 msgid "Levels"
 msgstr "レベル"
 
@@ -8100,78 +8732,78 @@ msgctxt "undo-type"
 msgid "Offset Drawable"
 msgstr "描画対象のオフセット"
 
-#: ../app/core/gimpdrawable-stroke.c:272
-#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:557
+#: ../app/core/gimpdrawable-stroke.c:271
+#: ../app/paint/gimppaintcore-stroke.c:331 ../app/vectors/gimpvectors.c:555
 msgid "Not enough points to stroke"
 msgstr "アンカー (端点) が不足しているので描画できません"
 
-#: ../app/core/gimpdrawable-stroke.c:273
+#: ../app/core/gimpdrawable-stroke.c:272
 msgid "Not enough points to fill"
 msgstr "アンカー (端点) が不足しているので塗りつぶしができません"
 
-#: ../app/core/gimpdrawable-stroke.c:395
+#: ../app/core/gimpdrawable-stroke.c:387
 msgctxt "undo-type"
 msgid "Render Stroke"
 msgstr "ストローク描画"
 
-#: ../app/core/gimpdrawable-transform.c:747
+#: ../app/core/gimpdrawable-transform.c:723
 msgctxt "undo-type"
 msgid "Flip"
 msgstr "鏡像反転"
 
-#: ../app/core/gimpdrawable-transform.c:833
+#: ../app/core/gimpdrawable-transform.c:809
 msgctxt "undo-type"
 msgid "Rotate"
 msgstr "回転"
 
-#: ../app/core/gimpdrawable-transform.c:974 ../app/core/gimplayer.c:297
+#: ../app/core/gimpdrawable-transform.c:950 ../app/core/gimplayer.c:308
 msgctxt "undo-type"
 msgid "Transform Layer"
 msgstr "レイヤーを変形"
 
-#: ../app/core/gimpdrawable-transform.c:987
+#: ../app/core/gimpdrawable-transform.c:963
 msgid "Transformation"
 msgstr "変形"
 
-#: ../app/core/gimpdynamicsoutput.c:135
+#: ../app/core/gimpdynamicsoutput.c:136
 msgid "Output type"
 msgstr "出力タイプ"
 
-#: ../app/core/gimp-edit.c:184 ../app/core/gimpimage-new.c:305
+#: ../app/core/gimp-edit.c:182 ../app/core/gimpimage-new.c:306
 msgid "Pasted Layer"
 msgstr "貼り付けられたレイヤー"
 
-#: ../app/core/gimp-edit.c:387
+#: ../app/core/gimp-edit.c:419
 msgctxt "undo-type"
 msgid "Clear"
 msgstr "消去"
 
-#: ../app/core/gimp-edit.c:411
+#: ../app/core/gimp-edit.c:443
 msgctxt "undo-type"
 msgid "Fill with Foreground Color"
 msgstr "描画色で塗りつぶす"
 
-#: ../app/core/gimp-edit.c:416
+#: ../app/core/gimp-edit.c:448
 msgctxt "undo-type"
 msgid "Fill with Background Color"
 msgstr "背景色で塗りつぶす"
 
-#: ../app/core/gimp-edit.c:421
+#: ../app/core/gimp-edit.c:453
 msgctxt "undo-type"
 msgid "Fill with White"
 msgstr "白色で塗りつぶす"
 
-#: ../app/core/gimp-edit.c:426
+#: ../app/core/gimp-edit.c:458
 msgctxt "undo-type"
 msgid "Fill with Transparency"
 msgstr "透明色で塗りつぶす"
 
-#: ../app/core/gimp-edit.c:431
+#: ../app/core/gimp-edit.c:463
 msgctxt "undo-type"
 msgid "Fill with Pattern"
 msgstr "パターンで塗りつぶす"
 
-#: ../app/core/gimp-edit.c:585
+#: ../app/core/gimp-edit.c:615
 msgid "Global Buffer"
 msgstr "クリップボード"
 
@@ -8223,23 +8855,23 @@ msgstr ""
 "'%s' からのグラデーションのインポートに失敗しました。\n"
 "%s"
 
-#: ../app/core/gimp-gradients.c:62
+#: ../app/core/gimp-gradients.c:63
 msgid "FG to BG (RGB)"
 msgstr "描画色から背景色 (RGB)"
 
-#: ../app/core/gimp-gradients.c:70
+#: ../app/core/gimp-gradients.c:71
 msgid "FG to BG (Hardedge)"
 msgstr "描画色から背景色 (ハードエッジ)"
 
-#: ../app/core/gimp-gradients.c:87
+#: ../app/core/gimp-gradients.c:88
 msgid "FG to BG (HSV counter-clockwise)"
 msgstr "描画色から背景色 (HSV 反時計回り)"
 
-#: ../app/core/gimp-gradients.c:95
+#: ../app/core/gimp-gradients.c:96
 msgid "FG to BG (HSV clockwise hue)"
 msgstr "描画色から背景色 (HSV 時計回り)"
 
-#: ../app/core/gimp-gradients.c:103
+#: ../app/core/gimp-gradients.c:104
 msgid "FG to Transparent"
 msgstr "描画色から透明"
 
@@ -8274,101 +8906,116 @@ msgstr "グリッド線の水平方向のオフセットを指定します。負
 msgid "Vertical offset of the first grid line; this may be a negative number."
 msgstr "グリッド線の垂直方向のオフセットを指定します。負の値も指定可能です。"
 
-#: ../app/core/gimpgrouplayer.c:220
+#: ../app/core/gimpgrouplayer.c:222
 msgid "Layer Group"
 msgstr "レイヤーグループ"
 
-#: ../app/core/gimpgrouplayer.c:221
+#: ../app/core/gimpgrouplayer.c:223
 msgctxt "undo-type"
 msgid "Rename Layer Group"
 msgstr "レイヤーグループ名を変更"
 
-#: ../app/core/gimpgrouplayer.c:222
+#: ../app/core/gimpgrouplayer.c:224
 msgctxt "undo-type"
 msgid "Move Layer Group"
 msgstr "レイヤーグループを移動"
 
-#: ../app/core/gimpgrouplayer.c:223
+#: ../app/core/gimpgrouplayer.c:225
 msgctxt "undo-type"
 msgid "Scale Layer Group"
 msgstr "レイヤーグループを拡大・縮小"
 
-#: ../app/core/gimpgrouplayer.c:224
+#: ../app/core/gimpgrouplayer.c:226
 msgctxt "undo-type"
 msgid "Resize Layer Group"
 msgstr "レイヤーグループのサイズ変更"
 
-#: ../app/core/gimpgrouplayer.c:225
+#: ../app/core/gimpgrouplayer.c:227
 msgctxt "undo-type"
 msgid "Flip Layer Group"
 msgstr "レイヤーグループを鏡像反転"
 
-#: ../app/core/gimpgrouplayer.c:226
+#: ../app/core/gimpgrouplayer.c:228
 msgctxt "undo-type"
 msgid "Rotate Layer Group"
 msgstr "レイヤーグループを回転"
 
-#: ../app/core/gimpgrouplayer.c:227
+#: ../app/core/gimpgrouplayer.c:229
 msgctxt "undo-type"
 msgid "Transform Layer Group"
 msgstr "レイヤーグループを変形"
 
-#: ../app/core/gimpimage-arrange.c:142
+#: ../app/core/gimpimage-arrange.c:143
 msgctxt "undo-type"
 msgid "Arrange Objects"
 msgstr "オブジェクトを並べる"
 
-#: ../app/core/gimpimage.c:1927
+# 編集画像をエクスポートした後の画像ウィンドウに表示される
+#: ../app/core/gimpimage.c:2008
+msgid " (exported)"
+msgstr " (エクスポート済み)"
+
+# 編集画像を上書きエクスポートした後の画像ウィンドウに表示される
+#: ../app/core/gimpimage.c:2012
+msgid " (overwritten)"
+msgstr " (上書き済み)"
+
+# 画像ファイルを開き(インポート)一度も [保存]、[名前を付けて保存] をしていない間に、ウィンドウタイトルにこの表記が使用される。
+#: ../app/core/gimpimage.c:2021
+msgid " (imported)"
+msgstr " (インポートされた画像)"
+
+#: ../app/core/gimpimage.c:2146
 msgctxt "undo-type"
 msgid "Change Image Resolution"
 msgstr "画像解像度の変更"
 
-#: ../app/core/gimpimage.c:1979
+#: ../app/core/gimpimage.c:2198
 msgctxt "undo-type"
 msgid "Change Image Unit"
 msgstr "画像単位の変更"
 
-#: ../app/core/gimpimage.c:2792
+#: ../app/core/gimpimage.c:3066
 msgctxt "undo-type"
 msgid "Attach Parasite to Image"
 msgstr "画像にパラサイトを付加"
 
-#: ../app/core/gimpimage.c:2833
+#: ../app/core/gimpimage.c:3107
 msgctxt "undo-type"
 msgid "Remove Parasite from Image"
 msgstr "画像からパラサイトを削除"
 
-#: ../app/core/gimpimage.c:3542
+#: ../app/core/gimpimage.c:3816
 msgctxt "undo-type"
 msgid "Add Layer"
 msgstr "レイヤーの追加"
 
-#: ../app/core/gimpimage.c:3592 ../app/core/gimpimage.c:3612
+#: ../app/core/gimpimage.c:3866 ../app/core/gimpimage.c:3886
 msgctxt "undo-type"
 msgid "Remove Layer"
 msgstr "レイヤーの削除"
 
-#: ../app/core/gimpimage.c:3606
+#: ../app/core/gimpimage.c:3880
 msgctxt "undo-type"
 msgid "Remove Floating Selection"
 msgstr "フローティング選択範囲の削除"
 
-#: ../app/core/gimpimage.c:3774
+#: ../app/core/gimpimage.c:4048
 msgctxt "undo-type"
 msgid "Add Channel"
 msgstr "チャンネルを追加"
 
-#: ../app/core/gimpimage.c:3812 ../app/core/gimpimage.c:3825
+#: ../app/core/gimpimage.c:4086 ../app/core/gimpimage.c:4099
 msgctxt "undo-type"
 msgid "Remove Channel"
 msgstr "チャンネルを削除"
 
-#: ../app/core/gimpimage.c:3879
+#: ../app/core/gimpimage.c:4153
 msgctxt "undo-type"
 msgid "Add Path"
 msgstr "パスを追加"
 
-#: ../app/core/gimpimage.c:3910
+#: ../app/core/gimpimage.c:4184
 msgctxt "undo-type"
 msgid "Remove Path"
 msgstr "パスを削除"
@@ -8383,82 +9030,127 @@ msgctxt "undo-type"
 msgid "Set Colormap"
 msgstr "カラーマップの設定"
 
-#: ../app/core/gimpimage-colormap.c:277
+#: ../app/core/gimpimage-colormap.c:244
+msgctxt "undo-type"
+msgid "Unset Colormap"
+msgstr "カラーマップの設定を解除"
+
+#: ../app/core/gimpimage-colormap.c:297
 msgctxt "undo-type"
 msgid "Change Colormap entry"
 msgstr "カラーマップエントリーの変更"
 
-#: ../app/core/gimpimage-colormap.c:305
+#: ../app/core/gimpimage-colormap.c:325
 msgctxt "undo-type"
 msgid "Add Color to Colormap"
 msgstr "カラーマップに色を追加"
 
-#: ../app/core/gimpimage-convert.c:773
-msgid "Cannot convert image: palette is empty."
-msgstr "パレットが空なので画像を変換できません。"
-
-#: ../app/core/gimpimage-convert.c:789
+#: ../app/core/gimpimage-convert-precision.c:69
+#, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Convert Image to Indexed"
 msgctxt "undo-type"
-msgid "Convert Image to RGB"
-msgstr "画像をRGBに変換"
+msgid "Convert Image to 8 bit linear integer"
+msgstr "インデックスカラーに変換"
 
-#: ../app/core/gimpimage-convert.c:793
+#: ../app/core/gimpimage-convert-precision.c:72
+#, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Convert Image to Indexed"
 msgctxt "undo-type"
-msgid "Convert Image to Grayscale"
-msgstr "画像をグレースケールに変換"
+msgid "Convert Image to 8 bit gamma integer"
+msgstr "インデックスカラーに変換"
 
-#: ../app/core/gimpimage-convert.c:797
+#: ../app/core/gimpimage-convert-precision.c:75
+#, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Convert Image to Indexed"
 msgctxt "undo-type"
-msgid "Convert Image to Indexed"
+msgid "Convert Image to 16 bit linear integer"
 msgstr "インデックスカラーに変換"
 
-#: ../app/core/gimpimage-convert.c:878
-msgid "Converting to indexed colors (stage 2)"
-msgstr "インデックスカラーに変換 (ステージ 2)..."
-
-#: ../app/core/gimpimage-convert.c:923
-msgid "Converting to indexed colors (stage 3)"
-msgstr "インデックスカラーに変換 (ステージ 3)..."
-
-#: ../app/core/gimpimage-convert-precision.c:63
+#: ../app/core/gimpimage-convert-precision.c:78
 #, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Convert Image to Indexed"
 msgctxt "undo-type"
-msgid "Convert Image to 8 bit integer"
+msgid "Convert Image to 16 bit gamma integer"
 msgstr "インデックスカラーに変換"
 
-#: ../app/core/gimpimage-convert-precision.c:67
+#: ../app/core/gimpimage-convert-precision.c:81
 #, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Convert Image to Indexed"
 msgctxt "undo-type"
-msgid "Convert Image to 16 bit integer"
+msgid "Convert Image to 32 bit linear integer"
 msgstr "インデックスカラーに変換"
 
-#: ../app/core/gimpimage-convert-precision.c:71
+#: ../app/core/gimpimage-convert-precision.c:84
 #, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Convert Image to Indexed"
 msgctxt "undo-type"
-msgid "Convert Image to 32 bit integer"
+msgid "Convert Image to 32 bit gamma integer"
 msgstr "インデックスカラーに変換"
 
-#: ../app/core/gimpimage-convert-precision.c:75
+#: ../app/core/gimpimage-convert-precision.c:87
 msgctxt "undo-type"
-msgid "Convert Image to 16 bit floating point"
+msgid "Convert Image to 16 bit linear floating point"
 msgstr ""
 
-#: ../app/core/gimpimage-convert-precision.c:79
+#: ../app/core/gimpimage-convert-precision.c:90
 msgctxt "undo-type"
-msgid "Convert Image to 32 bit floating point"
+msgid "Convert Image to 16 bit gamma floating point"
 msgstr ""
 
-#: ../app/core/gimpimage-crop.c:122
+#: ../app/core/gimpimage-convert-precision.c:93
+msgctxt "undo-type"
+msgid "Convert Image to 32 bit linear floating point"
+msgstr ""
+
+#: ../app/core/gimpimage-convert-precision.c:96
+msgctxt "undo-type"
+msgid "Convert Image to 32 bit gamma floating point"
+msgstr ""
+
+#: ../app/core/gimpimage-convert-type.c:778
+msgid "Cannot convert image: palette is empty."
+msgstr "パレットが空なので画像を変換できません。"
+
+#: ../app/core/gimpimage-convert-type.c:794
+msgctxt "undo-type"
+msgid "Convert Image to RGB"
+msgstr "画像をRGBに変換"
+
+#: ../app/core/gimpimage-convert-type.c:798
+msgctxt "undo-type"
+msgid "Convert Image to Grayscale"
+msgstr "画像をグレースケールに変換"
+
+#: ../app/core/gimpimage-convert-type.c:802
+msgctxt "undo-type"
+msgid "Convert Image to Indexed"
+msgstr "インデックスカラーに変換"
+
+#: ../app/core/gimpimage-convert-type.c:883
+msgid "Converting to indexed colors (stage 2)"
+msgstr "インデックスカラーに変換 (ステージ 2)..."
+
+#: ../app/core/gimpimage-convert-type.c:928
+msgid "Converting to indexed colors (stage 3)"
+msgstr "インデックスカラーに変換 (ステージ 3)..."
+
+#: ../app/core/gimpimage-crop.c:74
 msgctxt "undo-type"
 msgid "Crop Image"
 msgstr "画像の切り抜き"
 
-#: ../app/core/gimpimage-crop.c:125 ../app/core/gimpimage-resize.c:86
+#: ../app/core/gimpimage-crop.c:77 ../app/core/gimpimage-resize.c:90
 msgctxt "undo-type"
 msgid "Resize Image"
 msgstr "キャンバスサイズの変更"
 
-#: ../app/core/gimpimagefile.c:700 ../app/dialogs/preferences-dialog.c:1712
+#: ../app/core/gimpimagefile.c:700 ../app/dialogs/preferences-dialog.c:1540
 msgid "Folder"
 msgstr "フォルダー"
 
@@ -8491,14 +9183,14 @@ msgid "(Preview may be out of date)"
 msgstr "(プレビューが古すぎます)"
 
 #. pixel size
-#: ../app/core/gimpimagefile.c:777 ../app/widgets/gimpimagepropview.c:445
-#: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:572
+#: ../app/core/gimpimagefile.c:777 ../app/widgets/gimpimagepropview.c:443
+#: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:570
 #, c-format
 msgid "%d × %d pixel"
 msgid_plural "%d × %d pixels"
 msgstr[0] "%d × %d ピクセル"
 
-#: ../app/core/gimpimagefile.c:800 ../app/display/gimpdisplayshell-title.c:340
+#: ../app/core/gimpimagefile.c:800 ../app/display/gimpdisplayshell-title.c:321
 #, c-format
 msgid "%d layer"
 msgid_plural "%d layers"
@@ -8511,37 +9203,37 @@ msgstr ""
 "サムネイルファイル '%s' が開けません。\n"
 "%s"
 
-#: ../app/core/gimpimage-guides.c:52
+#: ../app/core/gimpimage-guides.c:53
 msgctxt "undo-type"
 msgid "Add Horizontal Guide"
 msgstr "水平ガイドを追加"
 
-#: ../app/core/gimpimage-guides.c:76
+#: ../app/core/gimpimage-guides.c:77
 msgctxt "undo-type"
 msgid "Add Vertical Guide"
 msgstr "垂直ガイドを追加"
 
-#: ../app/core/gimpimage-guides.c:117
+#: ../app/core/gimpimage-guides.c:118
 msgctxt "undo-type"
 msgid "Remove Guide"
 msgstr "ガイドを削除"
 
-#: ../app/core/gimpimage-guides.c:144
+#: ../app/core/gimpimage-guides.c:145
 msgctxt "undo-type"
 msgid "Move Guide"
 msgstr "ガイドを移動"
 
-#: ../app/core/gimpimage-item-list.c:51
+#: ../app/core/gimpimage-item-list.c:52
 msgctxt "undo-type"
 msgid "Translate Items"
 msgstr "アイテムの剪断変形"
 
-#: ../app/core/gimpimage-item-list.c:78
+#: ../app/core/gimpimage-item-list.c:79
 msgctxt "undo-type"
 msgid "Flip Items"
 msgstr "アイテムの鏡像反転"
 
-#: ../app/core/gimpimage-item-list.c:105
+#: ../app/core/gimpimage-item-list.c:106
 msgctxt "undo-type"
 msgid "Rotate Items"
 msgstr "アイテムの回転"
@@ -8551,48 +9243,52 @@ msgctxt "undo-type"
 msgid "Transform Items"
 msgstr "アイテムの変形"
 
-#: ../app/core/gimpimage-merge.c:136
+#: ../app/core/gimpimage-merge.c:132
 msgctxt "undo-type"
 msgid "Merge Visible Layers"
 msgstr "可視レイヤーの統合"
 
-#: ../app/core/gimpimage-merge.c:182
+#: ../app/core/gimpimage-merge.c:195
 msgctxt "undo-type"
 msgid "Flatten Image"
 msgstr "画像の統合"
 
-#: ../app/core/gimpimage-merge.c:252
+#: ../app/core/gimpimage-merge.c:217
+msgid "Cannot flatten an image without any visible layer."
+msgstr "画像に可視レイヤーがないので統合できません。"
+
+#: ../app/core/gimpimage-merge.c:260
 msgid "Cannot merge down to a layer group."
 msgstr "レイヤーグループに統合できません。"
 
-#: ../app/core/gimpimage-merge.c:259
+#: ../app/core/gimpimage-merge.c:267
 msgid "The layer to merge down to is locked."
 msgstr "統合対象のレイヤーは保護されています。"
 
-#: ../app/core/gimpimage-merge.c:271
+#: ../app/core/gimpimage-merge.c:279
 msgid "There is no visible layer to merge down to."
 msgstr "統合できる可視レイヤーがありません。"
 
-#: ../app/core/gimpimage-merge.c:281
+#: ../app/core/gimpimage-merge.c:289
 msgctxt "undo-type"
 msgid "Merge Down"
 msgstr "下のレイヤーと統合"
 
-#: ../app/core/gimpimage-merge.c:309
+#: ../app/core/gimpimage-merge.c:317
 msgctxt "undo-type"
 msgid "Merge Layer Group"
 msgstr "レイヤーグループの統合"
 
-#: ../app/core/gimpimage-merge.c:362
+#: ../app/core/gimpimage-merge.c:370
 msgctxt "undo-type"
 msgid "Merge Visible Paths"
 msgstr "可視パスの統合"
 
-#: ../app/core/gimpimage-merge.c:398
+#: ../app/core/gimpimage-merge.c:406
 msgid "Not enough visible paths for a merge. There must be at least two."
 msgstr "統合するための可視パスが足りません。少なくとも二つは必要です。"
 
-#: ../app/core/gimpimage-new.c:135
+#: ../app/core/gimpimage-new.c:136
 msgid "Background"
 msgstr "背景"
 
@@ -8606,120 +9302,124 @@ msgctxt "undo-type"
 msgid "Disable Quick Mask"
 msgstr "クイックマスク無効"
 
-#: ../app/core/gimpimage-sample-points.c:53
+#: ../app/core/gimpimage-sample-points.c:54
 msgctxt "undo-type"
 msgid "Add Sample Point"
 msgstr "サンプルポイントを追加 "
 
-#: ../app/core/gimpimage-sample-points.c:98
+#: ../app/core/gimpimage-sample-points.c:99
 msgctxt "undo-type"
 msgid "Remove Sample Point"
 msgstr "サンプルポイントを削除"
 
-#: ../app/core/gimpimage-sample-points.c:126
+#: ../app/core/gimpimage-sample-points.c:127
 msgctxt "undo-type"
 msgid "Move Sample Point"
 msgstr "サンプルポイントを移動"
 
-#: ../app/core/gimpimage-scale.c:85
+#: ../app/core/gimpimage-scale.c:87
 msgctxt "undo-type"
 msgid "Scale Image"
 msgstr "画像の拡大・縮小"
 
-#: ../app/core/gimpimage-undo-push.c:875
+#: ../app/core/gimpimage-undo-push.c:936
 #, c-format
 msgid "Can't undo %s"
 msgstr "%s は元に戻せません"
 
-#: ../app/core/gimpitem.c:1815
+#: ../app/core/gimpitem.c:1828
 msgctxt "undo-type"
 msgid "Attach Parasite"
 msgstr "パラサイトを付加"
 
-#: ../app/core/gimpitem.c:1825
+#: ../app/core/gimpitem.c:1838
 msgctxt "undo-type"
 msgid "Attach Parasite to Item"
 msgstr "アイテムにパラサイトを付加"
 
-#: ../app/core/gimpitem.c:1876 ../app/core/gimpitem.c:1883
+#: ../app/core/gimpitem.c:1889 ../app/core/gimpitem.c:1896
 msgctxt "undo-type"
 msgid "Remove Parasite from Item"
 msgstr "アイテムからパラサイトを削除"
 
-#: ../app/core/gimpitem-exclusive.c:81
+#: ../app/core/gimpitem-exclusive.c:82
 msgid "Set Item Exclusive Visible"
 msgstr "アイテムを排他表示にする"
 
-#: ../app/core/gimplayer.c:291
+#: ../app/core/gimpitem-exclusive.c:173
+msgid "Set Item Exclusive Linked"
+msgstr "アイテムを排他リンクにする"
+
+#: ../app/core/gimplayer.c:302
 msgctxt "undo-type"
 msgid "Rename Layer"
 msgstr "レイヤー名を変更"
 
-#: ../app/core/gimplayer.c:292
+#: ../app/core/gimplayer.c:303
 msgctxt "undo-type"
 msgid "Move Layer"
 msgstr "レイヤーを移動"
 
-#: ../app/core/gimplayer.c:293
+#: ../app/core/gimplayer.c:304
 msgctxt "undo-type"
 msgid "Scale Layer"
 msgstr "レイヤーの拡大・縮小"
 
-#: ../app/core/gimplayer.c:294
+#: ../app/core/gimplayer.c:305
 msgctxt "undo-type"
 msgid "Resize Layer"
 msgstr "レイヤーサイズの変更"
 
-#: ../app/core/gimplayer.c:295
+#: ../app/core/gimplayer.c:306
 msgctxt "undo-type"
 msgid "Flip Layer"
 msgstr "レイヤーを鏡像反転"
 
-#: ../app/core/gimplayer.c:296
+#: ../app/core/gimplayer.c:307
 msgctxt "undo-type"
 msgid "Rotate Layer"
 msgstr "レイヤーを回転"
 
-#: ../app/core/gimplayer.c:299
+#: ../app/core/gimplayer.c:310
 msgctxt "undo-type"
 msgid "Reorder Layer"
 msgstr "レイヤーの並べ替え"
 
-#: ../app/core/gimplayer.c:300
+#: ../app/core/gimplayer.c:311
 msgctxt "undo-type"
 msgid "Raise Layer"
 msgstr "レイヤーを前面へ"
 
-#: ../app/core/gimplayer.c:301
+#: ../app/core/gimplayer.c:312
 msgctxt "undo-type"
 msgid "Raise Layer to Top"
 msgstr "レイヤーを最前面へ"
 
-#: ../app/core/gimplayer.c:302
+#: ../app/core/gimplayer.c:313
 msgctxt "undo-type"
 msgid "Lower Layer"
 msgstr "レイヤーを背面へ"
 
-#: ../app/core/gimplayer.c:303
+#: ../app/core/gimplayer.c:314
 msgctxt "undo-type"
 msgid "Lower Layer to Bottom"
 msgstr "レイヤーを最背面へ"
 
-#: ../app/core/gimplayer.c:304
+#: ../app/core/gimplayer.c:315
 msgid "Layer cannot be raised higher."
 msgstr "これ以上レイヤーを前面に移動させられません"
 
-#: ../app/core/gimplayer.c:305
+#: ../app/core/gimplayer.c:316
 msgid "Layer cannot be lowered more."
 msgstr "これ以上レイヤーを背面に移動させられません"
 
-#: ../app/core/gimplayer.c:480 ../app/core/gimplayer.c:1316
-#: ../app/core/gimplayermask.c:183
+#: ../app/core/gimplayer.c:526 ../app/core/gimplayer.c:1441
+#: ../app/core/gimplayermask.c:256
 #, c-format
 msgid "%s mask"
 msgstr "%s マスク"
 
-#: ../app/core/gimplayer.c:519
+#: ../app/core/gimplayer.c:565
 #, c-format
 msgid ""
 "Floating Selection\n"
@@ -8728,7 +9428,7 @@ msgstr ""
 "フローティング選択範囲\n"
 "(%s)"
 
-#: ../app/core/gimplayer.c:664 ../app/core/gimplayer-floating-sel.c:126
+#: ../app/core/gimplayer.c:799 ../app/core/gimplayer-floating-sel.c:154
 msgid ""
 "Cannot create a new layer from the floating selection because it belongs to "
 "a layer mask or channel."
@@ -8736,120 +9436,120 @@ msgstr ""
 "レイヤーマスクやチャンネルに属しているので、フローティング選択範囲から新しい"
 "レイヤーは作成できません。"
 
-#: ../app/core/gimplayer.c:1227
+#: ../app/core/gimplayer.c:1346
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr ""
 "既にレイヤーマスクがあります。これ以上レイヤーマスクを付加する事はできませ"
 "ん。"
 
-#: ../app/core/gimplayer.c:1238
+#: ../app/core/gimplayer.c:1357
 msgid "Cannot add layer mask of different dimensions than specified layer."
 msgstr ""
 "指定したレイヤーと異る大きさを持つレイヤーマスクを付加することはできません。"
 
-#: ../app/core/gimplayer.c:1244
+#: ../app/core/gimplayer.c:1363
 msgctxt "undo-type"
 msgid "Add Layer Mask"
 msgstr "レイヤーマスクを追加"
 
-#: ../app/core/gimplayer.c:1368
+#: ../app/core/gimplayer.c:1491
 msgctxt "undo-type"
 msgid "Transfer Alpha to Mask"
 msgstr "アルファチャンネルをマスクに変換"
 
-#: ../app/core/gimplayer.c:1527
+#: ../app/core/gimplayer.c:1638
 msgctxt "undo-type"
 msgid "Apply Layer Mask"
 msgstr "レイヤーマスクを適用"
 
-#: ../app/core/gimplayer.c:1528
+#: ../app/core/gimplayer.c:1639
 msgctxt "undo-type"
 msgid "Delete Layer Mask"
 msgstr "レイヤーマスクを削除"
 
-#: ../app/core/gimplayer.c:1636
+#: ../app/core/gimplayer.c:1742
 msgctxt "undo-type"
 msgid "Enable Layer Mask"
 msgstr "レイヤーマスクを有効化"
 
-#: ../app/core/gimplayer.c:1637
+#: ../app/core/gimplayer.c:1743
 msgctxt "undo-type"
 msgid "Disable Layer Mask"
 msgstr "レイヤーマスクを無効化"
 
-#: ../app/core/gimplayer.c:1715
+#: ../app/core/gimplayer.c:1822
 msgctxt "undo-type"
 msgid "Show Layer Mask"
 msgstr "レイヤーマスクを表示"
 
-#: ../app/core/gimplayer.c:1794
+#: ../app/core/gimplayer.c:1896
 msgctxt "undo-type"
 msgid "Add Alpha Channel"
 msgstr "アルファチャンネルを追加"
 
-#: ../app/core/gimplayer.c:1829
+#: ../app/core/gimplayer.c:1928
 msgctxt "undo-type"
 msgid "Remove Alpha Channel"
 msgstr "アルファチャンネルを削除"
 
-#: ../app/core/gimplayer.c:1849
+#: ../app/core/gimplayer.c:1948
 msgctxt "undo-type"
 msgid "Layer to Image Size"
 msgstr "レイヤーをキャンバスに合わせる"
 
-#: ../app/core/gimplayer-floating-sel.c:95
+#: ../app/core/gimplayer-floating-sel.c:97
 msgctxt "undo-type"
 msgid "Anchor Floating Selection"
 msgstr "フローティング選択範囲の固定"
 
-#: ../app/core/gimplayer-floating-sel.c:133
+#: ../app/core/gimplayer-floating-sel.c:161
 msgctxt "undo-type"
 msgid "Floating Selection to Layer"
 msgstr "フローティング選択範囲をレイヤーに"
 
-#: ../app/core/gimplayermask.c:67
+#: ../app/core/gimplayermask.c:82
 msgctxt "undo-type"
 msgid "Move Layer Mask"
 msgstr "レイヤーマスクを移動"
 
-#: ../app/core/gimplayermask.c:68
+#: ../app/core/gimplayermask.c:83
 msgctxt "undo-type"
 msgid "Layer Mask to Selection"
 msgstr "レイヤーマスクを選択範囲に"
 
-#: ../app/core/gimplayermask.c:129
+#: ../app/core/gimplayermask.c:158
 #, c-format
 msgid "Cannot rename layer masks."
 msgstr "レイヤーマスク名を変更できません"
 
-#: ../app/core/gimppalette-import.c:426
+#: ../app/core/gimppalette-import.c:427
 #, c-format
 msgid "Index %d"
 msgstr "インデックス %d"
 
-#: ../app/core/gimppalette-import.c:536
+#: ../app/core/gimppalette-import.c:549
 #, c-format
 msgid "Unknown type of palette file: %s"
 msgstr "'%s' のパレットファイルの種類が不明です。"
 
-#: ../app/core/gimppalette-load.c:87 ../app/core/gimppalette-load.c:113
-#: ../app/core/gimppalette-load.c:134 ../app/core/gimppalette-load.c:163
-#: ../app/core/gimppalette-load.c:239
+#: ../app/core/gimppalette-load.c:101 ../app/core/gimppalette-load.c:125
+#: ../app/core/gimppalette-load.c:145 ../app/core/gimppalette-load.c:173
+#: ../app/core/gimppalette-load.c:248
 #, c-format
 msgid "Fatal parse error in palette file '%s': Read error in line %d."
 msgstr "パレット '%s' で致命的な解析エラー: %d 行目で読み込みエラー。"
 
-#: ../app/core/gimppalette-load.c:97
+#: ../app/core/gimppalette-load.c:110
 #, c-format
 msgid "Fatal parse error in palette file '%s': Missing magic header."
 msgstr "パレット '%s' で致命的な解析エラー: ヘッダーが見つかりません。"
 
-#: ../app/core/gimppalette-load.c:126
+#: ../app/core/gimppalette-load.c:137
 #, c-format
 msgid "Invalid UTF-8 string in palette file '%s'"
 msgstr "パレット '%s' 中に適切でない UTF-8 文字列があります"
 
-#: ../app/core/gimppalette-load.c:150
+#: ../app/core/gimppalette-load.c:160
 #, c-format
 msgid ""
 "Reading palette file '%s': Invalid number of columns in line %d. Using "
@@ -8858,32 +9558,32 @@ msgstr ""
 "パレット '%s' (%d 行目) 読み込み中: 無効な列数です。デフォルト値を使用しま"
 "す。"
 
-#: ../app/core/gimppalette-load.c:186
+#: ../app/core/gimppalette-load.c:195
 #, c-format
 msgid "Reading palette file '%s': Missing RED component in line %d."
 msgstr "パレット '%s' 読み込み中: %d 行目で赤の要素が見つかりません。"
 
-#: ../app/core/gimppalette-load.c:194
+#: ../app/core/gimppalette-load.c:203
 #, c-format
 msgid "Reading palette file '%s': Missing GREEN component in line %d."
 msgstr "パレット '%s' 読み込み中: %d 行目で緑の要素が見つかりません。"
 
-#: ../app/core/gimppalette-load.c:202
+#: ../app/core/gimppalette-load.c:211
 #, c-format
 msgid "Reading palette file '%s': Missing BLUE component in line %d."
 msgstr "パレット '%s' 読み込み中: %d 行目で青の要素が見つかりません。"
 
-#: ../app/core/gimppalette-load.c:212
+#: ../app/core/gimppalette-load.c:221
 #, c-format
 msgid "Reading palette file '%s': RGB value out of range in line %d."
 msgstr "パレット '%s' (%d 行目) 読み込み中: RGB 値が範囲外です。"
 
-#: ../app/core/gimppalette-load.c:479
+#: ../app/core/gimppalette-load.c:439
 #, c-format
 msgid "Could not read header from palette file '%s'"
 msgstr "パレット '%s' から ヘッダーを読み込むことができません。"
 
-#: ../app/core/gimppalette-load.c:502 ../app/core/gimppalette-load.c:590
+#: ../app/core/gimppalette-load.c:461 ../app/core/gimppalette-load.c:548
 #, c-format
 msgid "Fatal parse error in palette file '%s'"
 msgstr "パレット '%s' で致命的な解析エラーが発生しました"
@@ -8914,89 +9614,89 @@ msgstr ""
 msgid "Invalid UTF-8 string in pattern file '%s'."
 msgstr "GIMP パターンファイル '%s' 中に適切でない UTF-8 文字列があります。"
 
-#: ../app/core/gimppdbprogress.c:282 ../app/widgets/gimppdbdialog.c:334
+#: ../app/core/gimppdbprogress.c:282 ../app/widgets/gimppdbdialog.c:333
 #, c-format
 msgid "Unable to run %s callback. The corresponding plug-in may have crashed."
 msgstr ""
-"%sコールバックを実行できません。対応するプラグインがクラッシュしたかもしれま"
-"せん。"
+"%sコールバックを実行できません。対応するプラグインがクラッシュした可能性があ"
+"ります。"
 
 #: ../app/core/gimpprogress.c:106 ../app/core/gimpprogress.c:153
 msgid "Please wait"
 msgstr "お待ちください"
 
-#: ../app/core/gimpselection.c:154
+#: ../app/core/gimpselection.c:162
 msgctxt "undo-type"
 msgid "Move Selection"
 msgstr "選択範囲を移動"
 
-#: ../app/core/gimpselection.c:155
+#: ../app/core/gimpselection.c:163
 msgctxt "undo-type"
 msgid "Stroke Selection"
 msgstr "選択範囲の境界線を描画"
 
-#: ../app/core/gimpselection.c:171
+#: ../app/core/gimpselection.c:180
 msgctxt "undo-type"
 msgid "Feather Selection"
 msgstr "選択範囲の境界をぼかす"
 
-#: ../app/core/gimpselection.c:172
+#: ../app/core/gimpselection.c:181
 msgctxt "undo-type"
 msgid "Sharpen Selection"
 msgstr "選択範囲の境界を明確化"
 
-#: ../app/core/gimpselection.c:173
+#: ../app/core/gimpselection.c:182
 msgctxt "undo-type"
 msgid "Select None"
 msgstr "選択を解除"
 
-#: ../app/core/gimpselection.c:174
+#: ../app/core/gimpselection.c:183
 msgctxt "undo-type"
 msgid "Select All"
 msgstr "すべて選択"
 
-#: ../app/core/gimpselection.c:175
+#: ../app/core/gimpselection.c:184
 msgctxt "undo-type"
 msgid "Invert Selection"
 msgstr "選択範囲を反転"
 
-#: ../app/core/gimpselection.c:176
+#: ../app/core/gimpselection.c:185
 msgctxt "undo-type"
 msgid "Border Selection"
 msgstr "縁取り選択"
 
-#: ../app/core/gimpselection.c:177
+#: ../app/core/gimpselection.c:186
 msgctxt "undo-type"
 msgid "Grow Selection"
 msgstr "選択範囲の拡大"
 
-#: ../app/core/gimpselection.c:178
+#: ../app/core/gimpselection.c:187
 msgctxt "undo-type"
 msgid "Shrink Selection"
 msgstr "選択範囲の縮小"
 
-#: ../app/core/gimpselection.c:285
+#: ../app/core/gimpselection.c:294
 msgid "There is no selection to stroke."
 msgstr "ストローク描画する選択範囲がありません"
 
-#: ../app/core/gimpselection.c:660
+#: ../app/core/gimpselection.c:695
 msgid "Unable to cut or copy because the selected region is empty."
 msgstr "選択範囲が空なので切り取りやコピーはできません。"
 
-#: ../app/core/gimpselection.c:793
+#: ../app/core/gimpselection.c:823
 msgid "Cannot float selection because the selected region is empty."
 msgstr "選択範囲が空なのでフロート化はできません。"
 
-#: ../app/core/gimpselection.c:800
+#: ../app/core/gimpselection.c:830
 msgctxt "undo-type"
 msgid "Float Selection"
 msgstr "フローティング選択範囲"
 
-#: ../app/core/gimpselection.c:816
+#: ../app/core/gimpselection.c:846
 msgid "Floated Layer"
 msgstr "フロート化されたレイヤー"
 
-#: ../app/core/gimpstrokeoptions.c:182
+#: ../app/core/gimpstrokeoptions.c:183
 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."
@@ -9010,22 +9710,22 @@ msgstr ""
 #. * gimp-tags-default.xml. E.g. lithuanian for the translation,
 #. * that would be "tags-locale:lt".
 #.
-#: ../app/core/gimp-tags.c:88
+#: ../app/core/gimp-tags.c:89
 msgid "tags-locale:C"
 msgstr "tags-locale:ja"
 
-#: ../app/core/gimptemplate.c:132
+#: ../app/core/gimptemplate.c:135
 msgid "The unit used for coordinate display when not in dot-for-dot mode."
 msgstr ""
 "画像の大きさを示す単位を指定します。\n"
 "画像ウィンドウの一般設定が [ピクセル等倍で表示] でないときは、設定した値と単"
 "位による実寸で画面上に表示されます。"
 
-#: ../app/core/gimptemplate.c:139
+#: ../app/core/gimptemplate.c:142
 msgid "The horizontal image resolution."
 msgstr "水平方向の単位あたりのピクセル数を設定します"
 
-#: ../app/core/gimptemplate.c:145
+#: ../app/core/gimptemplate.c:148
 msgid "The vertical image resolution."
 msgstr "垂直方向の単位あたりのピクセル数を設定します"
 
@@ -9089,7 +9789,7 @@ msgctxt "plural"
 msgid "percent"
 msgstr "パーセント"
 
-#: ../app/core/gimp-user-install.c:160
+#: ../app/core/gimp-user-install.c:175
 #, c-format
 msgid ""
 "It seems you have used GIMP %s before.  GIMP will now migrate your user "
@@ -9098,7 +9798,7 @@ msgstr ""
 "現在のユーザーは、GIMP %s を使っていました。そのユーザーセッティングを '%s' "
 "に移行します。"
 
-#: ../app/core/gimp-user-install.c:165
+#: ../app/core/gimp-user-install.c:180
 #, c-format
 msgid ""
 "It appears that you are using GIMP for the first time.  GIMP will now create "
@@ -9107,24 +9807,24 @@ msgstr ""
 "現在のユーザーは初めて GIMP を使用します。'%s' という名のフォルダーを作成し、"
 "そこに必要なファイルをコピーします。"
 
-#: ../app/core/gimp-user-install.c:317
+#: ../app/core/gimp-user-install.c:379
 #, c-format
 msgid "Copying file '%s' from '%s'..."
 msgstr "'%2$s' から '%1$s' へファイルをコピー中..."
 
-#: ../app/core/gimp-user-install.c:332 ../app/core/gimp-user-install.c:358
+#: ../app/core/gimp-user-install.c:394 ../app/core/gimp-user-install.c:420
 #, c-format
 msgid "Creating folder '%s'..."
 msgstr "フォルダー '%s' を作成中..."
 
-#: ../app/core/gimp-user-install.c:343 ../app/core/gimp-user-install.c:369
+#: ../app/core/gimp-user-install.c:405 ../app/core/gimp-user-install.c:431
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr ""
 "フォルダー '%s' を作成できません。\n"
 "%s"
 
-#: ../app/dialogs/about-dialog.c:115 ../app/gui/gui.c:493
+#: ../app/dialogs/about-dialog.c:115
 msgid "About GIMP"
 msgstr "GIMP について"
 
@@ -9164,44 +9864,92 @@ msgstr "チャンネル名(_N):"
 msgid "Initialize from _selection"
 msgstr "選択範囲で初期化(_S)"
 
-#: ../app/dialogs/convert-dialog.c:125
+#: ../app/dialogs/convert-precision-dialog.c:114
+#, fuzzy, c-format
+#| msgctxt "undo-type"
+#| msgid "Convert Image to RGB"
+msgid "Convert Image to %s"
+msgstr "画像をRGBに変換"
+
+#: ../app/dialogs/convert-precision-dialog.c:118
+msgid "Precision Conversion"
+msgstr ""
+
+#: ../app/dialogs/convert-precision-dialog.c:133
+#: ../app/dialogs/convert-type-dialog.c:141
+msgid "C_onvert"
+msgstr "変換(_O)"
+
+#. dithering
+#: ../app/dialogs/convert-precision-dialog.c:164
+#: ../app/dialogs/convert-type-dialog.c:237
+#: ../app/tools/gimpblendoptions.c:248
+msgid "Dithering"
+msgstr "ディザリング"
+
+#: ../app/dialogs/convert-precision-dialog.c:180
+#, fuzzy
+#| msgctxt "dialogs-action"
+#| msgid "_Layers"
+msgid "_Layers:"
+msgstr "レイヤー(_L)"
+
+#: ../app/dialogs/convert-precision-dialog.c:202
+#, fuzzy
+#| msgid "Text Layer"
+msgid "_Text Layers:"
+msgstr "テキストレイヤー"
+
+#: ../app/dialogs/convert-precision-dialog.c:219
+#: ../app/dialogs/convert-type-dialog.c:287
+msgid "Dithering text layers will make them uneditable"
+msgstr ""
+
+#: ../app/dialogs/convert-precision-dialog.c:228
+#, fuzzy
+#| msgid "Channel _name:"
+msgid "_Channels and Masks:"
+msgstr "チャンネル名(_N):"
+
+#: ../app/dialogs/convert-precision-dialog.c:262
+msgid "Converting to lower bit depth"
+msgstr ""
+
+#: ../app/dialogs/convert-type-dialog.c:128
 msgid "Indexed Color Conversion"
 msgstr "インデックスカラー変換"
 
-#: ../app/dialogs/convert-dialog.c:128
+#: ../app/dialogs/convert-type-dialog.c:131
 msgid "Convert Image to Indexed Colors"
 msgstr "インデックスカラーに変換"
 
-#: ../app/dialogs/convert-dialog.c:138
-msgid "C_onvert"
-msgstr "変換(_O)"
-
-#: ../app/dialogs/convert-dialog.c:190
+#: ../app/dialogs/convert-type-dialog.c:193
 msgid "_Maximum number of colors:"
 msgstr "最大色数(_M):"
 
-#: ../app/dialogs/convert-dialog.c:217
+#: ../app/dialogs/convert-type-dialog.c:220
 msgid "_Remove unused colors from colormap"
 msgstr "未使用の色をカラーマップから削除(_R)"
 
-#. dithering
-#: ../app/dialogs/convert-dialog.c:234 ../app/tools/gimpblendoptions.c:255
-msgid "Dithering"
-msgstr "ディザリング"
-
-#: ../app/dialogs/convert-dialog.c:246
+#: ../app/dialogs/convert-type-dialog.c:249
 msgid "Color _dithering:"
 msgstr "色ディザリング(_D):"
 
-#: ../app/dialogs/convert-dialog.c:261
+#: ../app/dialogs/convert-type-dialog.c:264
 msgid "Enable dithering of _transparency"
 msgstr "透明部分のディザリングを行う(_T)"
 
-#: ../app/dialogs/convert-dialog.c:288
+#: ../app/dialogs/convert-type-dialog.c:276
+#, fuzzy
+#| msgid "Enable dithering of _transparency"
+msgid "Enable dithering of text layers"
+msgstr "透明部分のディザリングを行う(_T)"
+
+#: ../app/dialogs/convert-type-dialog.c:307
 msgid "Converting to indexed colors"
 msgstr "インデックスカラーに変換"
 
-#: ../app/dialogs/convert-dialog.c:416 ../app/pdb/convert-cmds.c:162
+#: ../app/dialogs/convert-type-dialog.c:437 ../app/pdb/convert-cmds.c:162
 msgid "Cannot convert to a palette with more than 256 colors."
 msgstr "256 色より多いパレットを変換することはできません。"
 
@@ -9220,69 +9968,69 @@ msgid ""
 "Are you sure you want to remove '%s' from the list and delete it on disk?"
 msgstr "'%s' をディスクと一覧から削除します。よろしいですか?"
 
-#: ../app/dialogs/dialogs.c:304
+#: ../app/dialogs/dialogs.c:305
 msgid "Devices"
 msgstr "デバイスの状態"
 
-#: ../app/dialogs/dialogs.c:304
+#: ../app/dialogs/dialogs.c:305
 msgid "Device Status"
 msgstr "デバイスの状態"
 
-#: ../app/dialogs/dialogs.c:308
+#: ../app/dialogs/dialogs.c:309
 msgid "Errors"
 msgstr "エラー"
 
-#: ../app/dialogs/dialogs.c:312
+#: ../app/dialogs/dialogs.c:313
 msgid "Pointer"
 msgstr "ピクセル情報"
 
-#: ../app/dialogs/dialogs.c:331
+#: ../app/dialogs/dialogs.c:332
 msgid "History"
 msgstr "ファイル履歴"
 
-#: ../app/dialogs/dialogs.c:333
+#: ../app/dialogs/dialogs.c:334
 msgid "Image Templates"
 msgstr "画像テンプレート"
 
-#: ../app/dialogs/dialogs.c:360
+#: ../app/dialogs/dialogs.c:361
 msgid "Histogram"
 msgstr "ヒストグラム"
 
-#: ../app/dialogs/dialogs.c:364
+#: ../app/dialogs/dialogs.c:365
 msgid "Selection"
 msgstr "選択範囲"
 
-#: ../app/dialogs/dialogs.c:364
+#: ../app/dialogs/dialogs.c:365
 msgid "Selection Editor"
 msgstr "選択範囲エディター"
 
 # 作業履歴ダイアログのタイトル
-#: ../app/dialogs/dialogs.c:368
+#: ../app/dialogs/dialogs.c:369
 msgid "Undo"
 msgstr "作業履歴"
 
-#: ../app/dialogs/dialogs.c:368
+#: ../app/dialogs/dialogs.c:369
 msgid "Undo History"
 msgstr "作業履歴"
 
-#: ../app/dialogs/dialogs.c:378
+#: ../app/dialogs/dialogs.c:379
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: ../app/dialogs/dialogs.c:378
+#: ../app/dialogs/dialogs.c:379
 msgid "Display Navigation"
 msgstr "ナビゲーションを表示"
 
-#: ../app/dialogs/dialogs.c:384
+#: ../app/dialogs/dialogs.c:385
 msgid "FG/BG"
 msgstr "描画色/背景色"
 
-#: ../app/dialogs/dialogs.c:384
+#: ../app/dialogs/dialogs.c:385
 msgid "FG/BG Color"
 msgstr "描画色/背景色"
 
-#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:161
-#: ../app/gui/gui-message.c:149
+#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:162
+#: ../app/gui/gui-message.c:150
 msgid "GIMP Message"
 msgstr "GIMP メッセージ"
 
@@ -9295,7 +10043,7 @@ msgstr "%s をフェード"
 msgid "_Fade"
 msgstr "フェード(_F)"
 
-#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:345
+#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:346
 msgid "_Mode:"
 msgstr "モード(_M):"
 
@@ -9303,7 +10051,7 @@ msgstr "モード(_M):"
 msgid "_Opacity:"
 msgstr "不透明度(_O):"
 
-#: ../app/dialogs/file-open-dialog.c:266
+#: ../app/dialogs/file-open-dialog.c:259
 msgid "Open layers"
 msgstr "レイヤーとして開く"
 
@@ -9315,15 +10063,15 @@ msgstr "場所を開く"
 msgid "Enter location (URI):"
 msgstr "場所の入力 (URI):"
 
-#: ../app/dialogs/file-save-dialog.c:105
+#: ../app/dialogs/file-save-dialog.c:113
 msgid "Export Image"
 msgstr "画像をエクスポート"
 
-#: ../app/dialogs/file-save-dialog.c:106
+#: ../app/dialogs/file-save-dialog.c:114
 msgid "_Export"
 msgstr "エクスポート(_E)"
 
-#: ../app/dialogs/file-save-dialog.c:431
+#: ../app/dialogs/file-save-dialog.c:458
 msgid ""
 "Saving remote files needs to determine the file format from the file "
 "extension. Please enter a file extension that matches the selected file "
@@ -9333,7 +10081,11 @@ msgstr ""
 "す。選択したファイル形式に合った拡張子を入力するか、拡張子を全く入力しないで"
 "ください。"
 
-#: ../app/dialogs/file-save-dialog.c:558
+#: ../app/dialogs/file-save-dialog.c:605
+msgid "The given filename cannot be used for exporting"
+msgstr "指定されたファイル名ではエクスポートできません"
+
+#: ../app/dialogs/file-save-dialog.c:606
 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."
@@ -9342,7 +10094,15 @@ msgstr ""
 "xcf 形式で画像を保存したいときは、メニューの [ファイル] → [保存] を実行してく"
 "ださい。"
 
-#: ../app/dialogs/file-save-dialog.c:565
+#: ../app/dialogs/file-save-dialog.c:609
+msgid "Take me to the Save dialog"
+msgstr "保存ダイアログを呼び出す"
+
+#: ../app/dialogs/file-save-dialog.c:613
+msgid "The given filename cannot be used for saving"
+msgstr "指定されたファイル名では保存できません"
+
+#: ../app/dialogs/file-save-dialog.c:614
 msgid ""
 "You can use this dialog to save to the GIMP XCF format. Use File→Export to "
 "export to other file formats."
@@ -9352,7 +10112,15 @@ msgstr ""
 "xcf 形式以外の画像ファイル形式で保存したいときは、メニューの [ファイル] → [エ"
 "クスポート] を実行してください。"
 
-#: ../app/dialogs/file-save-dialog.c:571
+#: ../app/dialogs/file-save-dialog.c:616
+msgid "Take me to the Export dialog"
+msgstr "エクスポートダイアログを呼び出す"
+
+#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694
+msgid "Extension Mismatch"
+msgstr "拡張子が一致しません"
+
+#: ../app/dialogs/file-save-dialog.c:678
 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."
@@ -9360,23 +10128,19 @@ msgstr ""
 "指定されたファイル名には既知のファイル拡張子がありません。既知のファイル拡張"
 "子を入力するか、ファイル形式の一覧からファイル形式を選択してください。"
 
-#: ../app/dialogs/file-save-dialog.c:585
-msgid "Extension Mismatch"
-msgstr "拡張子が一致しません"
-
-#: ../app/dialogs/file-save-dialog.c:601
+#: ../app/dialogs/file-save-dialog.c:710
 msgid "The given file extension does not match the chosen file type."
 msgstr "指定のファイル拡張子は選択したファイル形式と一致しません。"
 
-#: ../app/dialogs/file-save-dialog.c:605
+#: ../app/dialogs/file-save-dialog.c:714
 msgid "Do you want to save the image using this name anyway?"
 msgstr "画像をこの名前で保存してもよろしいですか?"
 
-#: ../app/dialogs/file-save-dialog.c:660
+#: ../app/dialogs/file-save-dialog.c:776
 msgid "Saving canceled"
 msgstr "保存をキャンセルしました"
 
-#: ../app/dialogs/file-save-dialog.c:668 ../app/widgets/gimpdnd-xds.c:185
+#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186
 #, c-format
 msgid ""
 "Saving '%s' failed:\n"
@@ -9440,7 +10204,7 @@ msgid "Create a New Image"
 msgstr "新しい画像を作成"
 
 #: ../app/dialogs/image-new-dialog.c:135
-#: ../app/dialogs/preferences-dialog.c:2010
+#: ../app/dialogs/preferences-dialog.c:1834
 msgid "_Template:"
 msgstr "テンプレート(_T):"
 
@@ -9510,15 +10274,15 @@ msgstr ""
 msgid "Is this what you want to do?"
 msgstr "それでもよろしいですか?"
 
-#: ../app/dialogs/input-devices-dialog.c:55
+#: ../app/dialogs/input-devices-dialog.c:56
 msgid "Configure Input Devices"
 msgstr "入力デバイスの設定"
 
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:48
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:49
 msgid "Configure Keyboard Shortcuts"
 msgstr "キーボードショートカット設定"
 
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:73
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:74
 msgid ""
 "To edit a shortcut key, click on the corresponding row and type a new "
 "accelerator, or press backspace to clear."
@@ -9528,7 +10292,7 @@ msgstr ""
 "ショートカットキーの設定解除は、解除したいコマンドをクリックして Backspace "
 "キーを押してください。"
 
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:81
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:82
 msgid "S_ave keyboard shortcuts on exit"
 msgstr "終了時にキーボードショートカットを保存する(_A)"
 
@@ -9544,30 +10308,30 @@ msgstr "レイヤーマスクの初期化方法:"
 msgid "In_vert mask"
 msgstr "マスク反転(_V)"
 
-#: ../app/dialogs/layer-options-dialog.c:125
+#: ../app/dialogs/layer-options-dialog.c:128
 msgid "Layer _name:"
 msgstr "レイヤー名(_N):"
 
 #. The size labels
-#: ../app/dialogs/layer-options-dialog.c:139
-#: ../app/tools/gimpmeasuretool.c:1129
+#: ../app/dialogs/layer-options-dialog.c:142
+#: ../app/tools/gimpmeasuretool.c:1123
 msgid "Width:"
 msgstr "幅:"
 
-#: ../app/dialogs/layer-options-dialog.c:145
-#: ../app/tools/gimpmeasuretool.c:1157
+#: ../app/dialogs/layer-options-dialog.c:148
+#: ../app/tools/gimpmeasuretool.c:1151
 msgid "Height:"
 msgstr "高さ:"
 
-#: ../app/dialogs/layer-options-dialog.c:202
+#: ../app/dialogs/layer-options-dialog.c:205
 msgid "Layer Fill Type"
 msgstr "レイヤー塗りつぶし方法"
 
-#: ../app/dialogs/layer-options-dialog.c:217
+#: ../app/dialogs/layer-options-dialog.c:224
 msgid "Set name from _text"
 msgstr "テキストから名前を設定(_T)"
 
-#: ../app/dialogs/lebl-dialog.c:123
+#: ../app/dialogs/lebl-dialog.c:125
 #, c-format
 msgid "<b>GAME OVER</b> at level %d!"
 msgstr ""
@@ -9576,133 +10340,137 @@ msgstr ""
 #. * title, and the second string is a small information text.
 #. * The spaces are there only to separate all the strings, so
 #. try to keep them as is.
-#: ../app/dialogs/lebl-dialog.c:130
+#: ../app/dialogs/lebl-dialog.c:132
 #, c-format
 msgid "%1$s   %2$s   %3$s"
 msgstr ""
 
-#: ../app/dialogs/lebl-dialog.c:131
+#: ../app/dialogs/lebl-dialog.c:133
+#, fuzzy
+#| msgid "Press %s to quit."
 msgid "Press 'q' to quit"
-msgstr ""
+msgstr "終了するには %s キーを押します。"
 
-#: ../app/dialogs/lebl-dialog.c:136
+#: ../app/dialogs/lebl-dialog.c:138
 msgid "Paused"
 msgstr ""
 
 #. Translators: the first string is a title and the second
 #. * string is a small information text.
-#: ../app/dialogs/lebl-dialog.c:139 ../app/dialogs/lebl-dialog.c:150
+#: ../app/dialogs/lebl-dialog.c:141 ../app/dialogs/lebl-dialog.c:152
 #, c-format
 msgid "%1$s\t%2$s"
 msgstr ""
 
-#: ../app/dialogs/lebl-dialog.c:140
+#: ../app/dialogs/lebl-dialog.c:142
 msgid "Press 'p' to unpause"
 msgstr ""
 
-#: ../app/dialogs/lebl-dialog.c:146
+#: ../app/dialogs/lebl-dialog.c:148
 #, c-format
 msgid "Level: %s,  Lives: %s"
 msgstr ""
 
-#: ../app/dialogs/lebl-dialog.c:151
+#: ../app/dialogs/lebl-dialog.c:153
 msgid "Left/Right to move, Space to fire, 'p' to pause, 'q' to quit"
 msgstr ""
 
-#: ../app/dialogs/lebl-dialog.c:800
+#: ../app/dialogs/lebl-dialog.c:804
 msgid "Killer GEGLs from Outer Space"
 msgstr ""
 
-#: ../app/dialogs/module-dialog.c:126
+#: ../app/dialogs/module-dialog.c:127
 msgid "Module Manager"
 msgstr "モジュールマネージャー"
 
-#: ../app/dialogs/module-dialog.c:150
+#: ../app/dialogs/module-dialog.c:151
 msgid "You will have to restart GIMP for the changes to take effect."
 msgstr "変更を有効にするには GIMP を再起動する必要があります。"
 
-#: ../app/dialogs/module-dialog.c:191
+#: ../app/dialogs/module-dialog.c:192
 msgid "Module"
 msgstr "モジュール"
 
-#: ../app/dialogs/module-dialog.c:465
+#: ../app/dialogs/module-dialog.c:469
 msgid "Only in memory"
 msgstr "メモリー中のみ"
 
-#: ../app/dialogs/module-dialog.c:470
+#: ../app/dialogs/module-dialog.c:474
 msgid "No longer available"
 msgstr "利用可能なものがありません"
 
-#: ../app/dialogs/module-dialog.c:495
+#: ../app/dialogs/module-dialog.c:499
 msgid "Author:"
 msgstr "作者:"
 
-#: ../app/dialogs/module-dialog.c:496
+#: ../app/dialogs/module-dialog.c:500
 msgid "Version:"
 msgstr "バージョン:"
 
-#: ../app/dialogs/module-dialog.c:497
+#: ../app/dialogs/module-dialog.c:501
 msgid "Date:"
 msgstr "日付:"
 
-#: ../app/dialogs/module-dialog.c:498
+#: ../app/dialogs/module-dialog.c:502
 msgid "Copyright:"
 msgstr "著作権:"
 
-#: ../app/dialogs/module-dialog.c:499
+#: ../app/dialogs/module-dialog.c:503
 msgid "Location:"
 msgstr "場所:"
 
-#: ../app/dialogs/offset-dialog.c:108
+#: ../app/dialogs/offset-dialog.c:112
 msgid "Offset Layer"
 msgstr "オフセットレイヤー"
 
-#: ../app/dialogs/offset-dialog.c:110
+#: ../app/dialogs/offset-dialog.c:114
 msgid "Offset Layer Mask"
 msgstr "オフセットレイヤーマスク"
 
-#: ../app/dialogs/offset-dialog.c:112
+#: ../app/dialogs/offset-dialog.c:116
 msgid "Offset Channel"
 msgstr "オフセットチャンネル"
 
 #. The offset frame
-#: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152
-#: ../app/dialogs/resize-dialog.c:198 ../app/tools/gimpblendoptions.c:248
-#: ../app/widgets/gimpgrideditor.c:207
+#: ../app/dialogs/offset-dialog.c:122 ../app/dialogs/offset-dialog.c:156
+#: ../app/dialogs/resize-dialog.c:200 ../app/tools/gimpblendoptions.c:241
+#: ../app/widgets/gimpgrideditor.c:206
 msgid "Offset"
 msgstr "オフセット"
 
 #. offset, used as a verb
-#: ../app/dialogs/offset-dialog.c:127
+#: ../app/dialogs/offset-dialog.c:131
 msgid "_Offset"
 msgstr "オフセット(_O)"
 
-#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:227
+#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:229
 msgid "_X:"
 msgstr "X(_X):"
 
-#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:228
+#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:230
 msgid "_Y:"
 msgstr "Y(_Y):"
 
 #: ../app/dialogs/offset-dialog.c:213
-msgid "Offset by  x/_2, y/2"
-msgstr "オフセットを (x/_2) と (y/2) に"
+msgid "By width/_2, height/2"
+msgstr ""
 
 #. The edge behavior frame
-#: ../app/dialogs/offset-dialog.c:222
+#: ../app/dialogs/offset-dialog.c:242
 msgid "Edge Behavior"
 msgstr "境界部分の処理方法"
 
-#: ../app/dialogs/offset-dialog.c:226
-msgid "_Wrap around"
+#: ../app/dialogs/offset-dialog.c:246
+#, fuzzy
+#| msgid "_Wrap around"
+msgid "W_rap around"
 msgstr "はみ出し部分を回り込ませる(_W)"
 
-#: ../app/dialogs/offset-dialog.c:229
+#: ../app/dialogs/offset-dialog.c:249
 msgid "Fill with _background color"
 msgstr "背景色で塗りつぶす(_B)"
 
-#: ../app/dialogs/offset-dialog.c:232
+#: ../app/dialogs/offset-dialog.c:252
 msgid "Make _transparent"
 msgstr "透明にする(_T)"
 
@@ -9720,7 +10488,7 @@ msgid "Select Source"
 msgstr "ソースの選択"
 
 #: ../app/dialogs/palette-import-dialog.c:214
-#: ../app/dialogs/preferences-dialog.c:1924
+#: ../app/dialogs/preferences-dialog.c:1750
 msgid "_Gradient"
 msgstr "グラデーション(_G)"
 
@@ -9779,19 +10547,19 @@ msgstr "プレビュー"
 msgid "The selected source contains no colors."
 msgstr "選択したソースには色がありません"
 
-#: ../app/dialogs/preferences-dialog.c:267
+#: ../app/dialogs/preferences-dialog.c:264
 msgid "Reset All Preferences"
 msgstr "設定リセットの確認"
 
-#: ../app/dialogs/preferences-dialog.c:285
+#: ../app/dialogs/preferences-dialog.c:282
 msgid "Do you really want to reset all preferences to default values?"
 msgstr "すべての設定を初期値に戻してもよろしいですか?"
 
-#: ../app/dialogs/preferences-dialog.c:355
+#: ../app/dialogs/preferences-dialog.c:352
 msgid "You will have to restart GIMP for the following changes to take effect:"
 msgstr "次に示す変更は、GIMP 再起動後に有効になります。"
 
-#: ../app/dialogs/preferences-dialog.c:537
+#: ../app/dialogs/preferences-dialog.c:534
 msgid ""
 "Your keyboard shortcuts will be reset to default values the next time you "
 "start GIMP."
@@ -9799,791 +10567,848 @@ msgstr ""
 "割り当てられていたキーボードショートカットは、次回 GIMP 起動時にデフォルト値"
 "に戻ります。"
 
-#: ../app/dialogs/preferences-dialog.c:548
+#: ../app/dialogs/preferences-dialog.c:545
 msgid "Remove all Keyboard Shortcuts"
 msgstr "キーボードショートカットをすべて消去"
 
-#: ../app/dialogs/preferences-dialog.c:570
+#: ../app/dialogs/preferences-dialog.c:567
 msgid "Do you really want to remove all keyboard shortcuts from all menus?"
 msgstr "キーボードショートカットをすべて消去してもよろしいですか?"
 
-#: ../app/dialogs/preferences-dialog.c:611
+#: ../app/dialogs/preferences-dialog.c:608
 msgid ""
 "Your window setup will be reset to default values the next time you start "
 "GIMP."
 msgstr "ウィンドウの設定は、次回 GIMP 起動時にデフォルト値に戻ります。"
 
-#: ../app/dialogs/preferences-dialog.c:646
+#: ../app/dialogs/preferences-dialog.c:643
 msgid ""
 "Your input device settings will be reset to default values the next time you "
 "start GIMP."
 msgstr "入力デバイスの設定は、次回 GIMP 起動時にデフォルト値に戻ります。"
 
-#: ../app/dialogs/preferences-dialog.c:681
+#: ../app/dialogs/preferences-dialog.c:678
 msgid ""
 "Your tool options will be reset to default values the next time you start "
 "GIMP."
 msgstr "ツールオプションの設定は、次回の GIMP 起動時にデフォルト値に戻ります。"
 
-#: ../app/dialogs/preferences-dialog.c:1267
+#: ../app/dialogs/preferences-dialog.c:1093
 msgid "Show _menubar"
 msgstr "メニューバー(_M)"
 
-#: ../app/dialogs/preferences-dialog.c:1271
+#: ../app/dialogs/preferences-dialog.c:1097
 msgid "Show _rulers"
 msgstr "ルーラー(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:1274
+#: ../app/dialogs/preferences-dialog.c:1100
 msgid "Show scroll_bars"
 msgstr "スクロールバー(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1277
+#: ../app/dialogs/preferences-dialog.c:1103
 msgid "Show s_tatusbar"
 msgstr "ステータスバー(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:1285
+#: ../app/dialogs/preferences-dialog.c:1111
 msgid "Show s_election"
 msgstr "選択範囲の境界線(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:1288
+#: ../app/dialogs/preferences-dialog.c:1114
 msgid "Show _layer boundary"
 msgstr "レイヤーの境界線(_L)"
 
-#: ../app/dialogs/preferences-dialog.c:1291
+#: ../app/dialogs/preferences-dialog.c:1117
 msgid "Show _guides"
 msgstr "ガイド(_G)"
 
-#: ../app/dialogs/preferences-dialog.c:1294
+#: ../app/dialogs/preferences-dialog.c:1120
 msgid "Show gri_d"
 msgstr "グリッド(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:1300
+#: ../app/dialogs/preferences-dialog.c:1126
 msgid "Canvas _padding mode:"
 msgstr "キャンバス周りの表示モード(_P):"
 
-#: ../app/dialogs/preferences-dialog.c:1305
+#: ../app/dialogs/preferences-dialog.c:1131
 msgid "Custom p_adding color:"
 msgstr "キャンバス周りの表示色(_A):"
 
-#: ../app/dialogs/preferences-dialog.c:1306
+#: ../app/dialogs/preferences-dialog.c:1132
 msgid "Select Custom Canvas Padding Color"
 msgstr "キャンバス周りの表示色"
 
-#: ../app/dialogs/preferences-dialog.c:1395
+#: ../app/dialogs/preferences-dialog.c:1163
+#, fuzzy
+#| msgctxt "view-action"
+#| msgid "Sn_ap to Guides"
+msgid "Snap to Guides"
+msgstr "ガイドにスナップ(_A)"
+
+#: ../app/dialogs/preferences-dialog.c:1166
+#, fuzzy
+#| msgctxt "view-action"
+#| msgid "Sna_p to Grid"
+msgid "Snap to Grid"
+msgstr "グリッドにスナップ(_P)"
+
+#: ../app/dialogs/preferences-dialog.c:1174
+#, fuzzy
+#| msgctxt "view-action"
+#| msgid "Snap to _Canvas Edges"
+msgid "Snap to Canvas Edges"
+msgstr "キャンバス境界にスナップ(_C)"
+
+#: ../app/dialogs/preferences-dialog.c:1177
+#, fuzzy
+#| msgctxt "view-action"
+#| msgid "Snap t_o Active Path"
+msgid "Snap to Active Path"
+msgstr "アクティブなパスにスナップ(_O)"
+
+#: ../app/dialogs/preferences-dialog.c:1305
 msgid "Preferences"
 msgstr "GIMP の設定"
 
-#: ../app/dialogs/preferences-dialog.c:1508
-#: ../app/dialogs/preferences-dialog.c:2784
+#: ../app/dialogs/preferences-dialog.c:1341
+#: ../app/dialogs/preferences-dialog.c:2617
 msgid "Environment"
 msgstr "環境"
 
-#: ../app/dialogs/preferences-dialog.c:1522
+#: ../app/dialogs/preferences-dialog.c:1351
 msgid "Resource Consumption"
 msgstr "リソースの使い方"
 
-#: ../app/dialogs/preferences-dialog.c:1532
+#: ../app/dialogs/preferences-dialog.c:1361
 msgid "Minimal number of _undo levels:"
 msgstr "作業履歴の最小エントリー数(_U):"
 
-#: ../app/dialogs/preferences-dialog.c:1535
+#: ../app/dialogs/preferences-dialog.c:1364
 msgid "Maximum undo _memory:"
 msgstr "作業履歴のメモリサイズ(_M):"
 
-#: ../app/dialogs/preferences-dialog.c:1538
+#: ../app/dialogs/preferences-dialog.c:1367
 msgid "Tile cache _size:"
 msgstr "タイルキャッシュサイズ(_S):"
 
-#: ../app/dialogs/preferences-dialog.c:1541
+#: ../app/dialogs/preferences-dialog.c:1370
 msgid "Maximum _new image size:"
 msgstr "新しい画像の最大サイズ(_N):"
 
-#: ../app/dialogs/preferences-dialog.c:1546
+#: ../app/dialogs/preferences-dialog.c:1375
 msgid "Number of _processors to use:"
 msgstr "使用するプロセッサーの数(_P):"
 
+#. Hardware Acceleration
+#: ../app/dialogs/preferences-dialog.c:1380
+msgid "Hardware Acceleration"
+msgstr ""
+
+#: ../app/dialogs/preferences-dialog.c:1384
+msgid "Use OpenCL"
+msgstr ""
+
 #. Image Thumbnails
-#: ../app/dialogs/preferences-dialog.c:1551
+#: ../app/dialogs/preferences-dialog.c:1388
 msgid "Image Thumbnails"
 msgstr "画像サムネイル"
 
-#: ../app/dialogs/preferences-dialog.c:1556
+#: ../app/dialogs/preferences-dialog.c:1393
 msgid "Size of _thumbnails:"
 msgstr "サムネイルのサイズ(_T):"
 
-#: ../app/dialogs/preferences-dialog.c:1560
+#: ../app/dialogs/preferences-dialog.c:1397
 msgid "Maximum _filesize for thumbnailing:"
 msgstr "サムネイルの最大ファイルサイズ(_F):"
 
-#. File Saving
-#: ../app/dialogs/preferences-dialog.c:1564
-msgid "Saving Images"
-msgstr "画像の保存"
-
-#: ../app/dialogs/preferences-dialog.c:1567
-msgid "Confirm closing of unsa_ved images"
-msgstr "未保存の画像を閉じるときに確認する(_V)"
-
-#: ../app/dialogs/preferences-dialog.c:1577
+#: ../app/dialogs/preferences-dialog.c:1407
 msgid "Keep record of used files in the Recent Documents list"
 msgstr "システムの [最近開いたファイル] にも記録・反映する"
 
-#: ../app/dialogs/preferences-dialog.c:1586
+#: ../app/dialogs/preferences-dialog.c:1416
 msgid "User Interface"
 msgstr "ユーザーインターフェース"
 
-#: ../app/dialogs/preferences-dialog.c:1589
+#: ../app/dialogs/preferences-dialog.c:1418
 msgid "Interface"
 msgstr "ユーザーインターフェース"
 
-#: ../app/dialogs/preferences-dialog.c:1599
+#: ../app/dialogs/preferences-dialog.c:1428
 msgid "Language"
 msgstr "言語の設定"
 
 #. Previews
-#: ../app/dialogs/preferences-dialog.c:1605
+#: ../app/dialogs/preferences-dialog.c:1434
 msgid "Previews"
 msgstr "プレビュー"
 
-#: ../app/dialogs/preferences-dialog.c:1608
+#: ../app/dialogs/preferences-dialog.c:1437
 msgid "_Enable layer & channel previews"
 msgstr "レイヤーとチャンネルのプレビューを表示する(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:1614
+#: ../app/dialogs/preferences-dialog.c:1443
 msgid "_Default layer & channel preview size:"
 msgstr "プレビューサイズの既定値(_D):"
 
-#: ../app/dialogs/preferences-dialog.c:1617
+#: ../app/dialogs/preferences-dialog.c:1446
 msgid "Na_vigation preview size:"
 msgstr "ナビゲーションのプレビューサイズ(_V):"
 
 #. Keyboard Shortcuts
-#: ../app/dialogs/preferences-dialog.c:1621
+#: ../app/dialogs/preferences-dialog.c:1450
 msgid "Keyboard Shortcuts"
 msgstr "キーボードショートカット"
 
-#: ../app/dialogs/preferences-dialog.c:1625
+#: ../app/dialogs/preferences-dialog.c:1454
 msgid "_Use dynamic keyboard shortcuts"
 msgstr "動的キーボードショートカットを使用する(_U)"
 
-#: ../app/dialogs/preferences-dialog.c:1629
+#: ../app/dialogs/preferences-dialog.c:1458
 msgid "Configure _Keyboard Shortcuts..."
 msgstr "キーボードショートカット設定(_K)..."
 
-#: ../app/dialogs/preferences-dialog.c:1636
+#: ../app/dialogs/preferences-dialog.c:1465
 msgid "_Save keyboard shortcuts on exit"
 msgstr "終了時にキーボードショートカットを保存する(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:1640
+#: ../app/dialogs/preferences-dialog.c:1469
 msgid "Save Keyboard Shortcuts _Now"
 msgstr "今すぐキーボードショートカットを保存(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:1647
+#: ../app/dialogs/preferences-dialog.c:1476
 msgid "_Reset Keyboard Shortcuts to Default Values"
 msgstr "キーボードショートカットのリセット(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:1656
+#: ../app/dialogs/preferences-dialog.c:1485
 msgid "Remove _All Keyboard Shortcuts"
 msgstr "すべてのキーボードショートカットを消去(_A)"
 
-#: ../app/dialogs/preferences-dialog.c:1668
-#: ../app/dialogs/preferences-dialog.c:1707
+#: ../app/dialogs/preferences-dialog.c:1497
+#: ../app/dialogs/preferences-dialog.c:1535
 msgid "Theme"
 msgstr "テーマ"
 
-#: ../app/dialogs/preferences-dialog.c:1677
+#: ../app/dialogs/preferences-dialog.c:1505
 msgid "Select Theme"
 msgstr "テーマの選択"
 
-#: ../app/dialogs/preferences-dialog.c:1759
+#: ../app/dialogs/preferences-dialog.c:1587
 msgid "Reload C_urrent Theme"
 msgstr "現在のテーマの再読み込み(_U)"
 
-#: ../app/dialogs/preferences-dialog.c:1771
+#: ../app/dialogs/preferences-dialog.c:1599
 msgid "Help System"
 msgstr "ヘルプ"
 
 #. General
-#: ../app/dialogs/preferences-dialog.c:1783
-#: ../app/dialogs/preferences-dialog.c:1867
-#: ../app/dialogs/preferences-dialog.c:2080
-#: ../app/widgets/gimpcontrollereditor.c:186
+#: ../app/dialogs/preferences-dialog.c:1610
+#: ../app/dialogs/preferences-dialog.c:1693
+#: ../app/dialogs/preferences-dialog.c:1902
+#: ../app/widgets/gimpcontrollereditor.c:185
 msgid "General"
 msgstr "全般"
 
-#: ../app/dialogs/preferences-dialog.c:1786
+#: ../app/dialogs/preferences-dialog.c:1613
 msgid "Show _tooltips"
 msgstr "ツールチップを表示する(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:1789
+#: ../app/dialogs/preferences-dialog.c:1616
 msgid "Show help _buttons"
 msgstr "ヘルプボタンを表示する(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1802
+#: ../app/dialogs/preferences-dialog.c:1629
 msgid "Use the online version"
 msgstr "オンライン版"
 
-#: ../app/dialogs/preferences-dialog.c:1803
+#: ../app/dialogs/preferences-dialog.c:1630
 msgid "Use a locally installed copy"
 msgstr "インストール版"
 
-#: ../app/dialogs/preferences-dialog.c:1804
+#: ../app/dialogs/preferences-dialog.c:1631
 msgid "User manual:"
 msgstr "使用するユーザーマニュアル:"
 
-#: ../app/dialogs/preferences-dialog.c:1811
+#: ../app/dialogs/preferences-dialog.c:1638
 msgid "There's a local installation of the user manual."
 msgstr "ユーザーマニュアルはインストール済です。"
 
-#: ../app/dialogs/preferences-dialog.c:1816
+#: ../app/dialogs/preferences-dialog.c:1643
 msgid "The user manual is not installed locally."
 msgstr "ユーザーマニュアルはインストールされていません。"
 
 #. Help Browser
-#: ../app/dialogs/preferences-dialog.c:1839
+#: ../app/dialogs/preferences-dialog.c:1666
 msgid "Help Browser"
 msgstr "ヘルプブラウザー"
 
-#: ../app/dialogs/preferences-dialog.c:1843
+#: ../app/dialogs/preferences-dialog.c:1670
 msgid "H_elp browser to use:"
 msgstr "使用するヘルプブラウザー(_E):"
 
-#: ../app/dialogs/preferences-dialog.c:1870
+#: ../app/dialogs/preferences-dialog.c:1682
+#, fuzzy
+#| msgid "Tool Options"
+msgctxt "preferences"
+msgid "Tool Options"
+msgstr "ツールオプション"
+
+#: ../app/dialogs/preferences-dialog.c:1696
 msgid "_Save tool options on exit"
 msgstr "終了時にツールオプションを保存する(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:1874
+#: ../app/dialogs/preferences-dialog.c:1700
 msgid "Save Tool Options _Now"
 msgstr "今すぐツールオプションを保存(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:1881
+#: ../app/dialogs/preferences-dialog.c:1707
 msgid "_Reset Saved Tool Options to Default Values"
 msgstr "ツールオプションのリセット(_R)"
 
 #. Snapping Distance
-#: ../app/dialogs/preferences-dialog.c:1891
+#: ../app/dialogs/preferences-dialog.c:1717
 msgid "Guide & Grid Snapping"
 msgstr "ガイドとグリッドにスナップ"
 
-#: ../app/dialogs/preferences-dialog.c:1896
+#: ../app/dialogs/preferences-dialog.c:1722
 msgid "_Snap distance:"
 msgstr "スナップ距離(_S):"
 
-#: ../app/dialogs/preferences-dialog.c:1904
+#: ../app/dialogs/preferences-dialog.c:1730
 msgid "Default _interpolation:"
 msgstr "既定の補間方法(_I):"
 
 #. Global Brush, Pattern, ...
-#: ../app/dialogs/preferences-dialog.c:1911
+#: ../app/dialogs/preferences-dialog.c:1737
 msgid "Paint Options Shared Between Tools"
 msgstr "ツール共有の描画オプション"
 
-#: ../app/dialogs/preferences-dialog.c:1915
+#: ../app/dialogs/preferences-dialog.c:1741
 msgid "_Brush"
 msgstr "ブラシ(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1918
+#: ../app/dialogs/preferences-dialog.c:1744
 msgid "_Dynamics"
 msgstr "動的特性(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:1921
+#: ../app/dialogs/preferences-dialog.c:1747
 msgid "_Pattern"
 msgstr "パターン(_P)"
 
 #. Move Tool
-#: ../app/dialogs/preferences-dialog.c:1928
+#: ../app/dialogs/preferences-dialog.c:1754
 msgid "Move Tool"
 msgstr "移動ツール"
 
-#: ../app/dialogs/preferences-dialog.c:1932
+#: ../app/dialogs/preferences-dialog.c:1758
 msgid "Set layer or path as active"
 msgstr "つかんだレイヤーやパスをアクティブにする"
 
 #. Appearance
-#: ../app/dialogs/preferences-dialog.c:1957
-#: ../app/dialogs/preferences-dialog.c:2156
-#: ../app/widgets/gimpgrideditor.c:135
+#: ../app/dialogs/preferences-dialog.c:1782
+#: ../app/dialogs/preferences-dialog.c:1974
+#: ../app/widgets/gimpgrideditor.c:134
 msgid "Appearance"
 msgstr "表示スタイル"
 
-#: ../app/dialogs/preferences-dialog.c:1961
+#: ../app/dialogs/preferences-dialog.c:1786
 msgid "Show _foreground & background color"
 msgstr "描画色と背景色(_F)"
 
-#: ../app/dialogs/preferences-dialog.c:1965
+#: ../app/dialogs/preferences-dialog.c:1790
 msgid "Show active _brush, pattern & gradient"
 msgstr "アクティブなブラシ・パターン・グラデーション(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1969
+#: ../app/dialogs/preferences-dialog.c:1794
 msgid "Show active _image"
 msgstr "アクティブな画像(_I)"
 
 #. Tool Editor
-#: ../app/dialogs/preferences-dialog.c:1977
+#: ../app/dialogs/preferences-dialog.c:1802
 msgid "Tools configuration"
 msgstr "ツールアイコンの設定"
 
-#: ../app/dialogs/preferences-dialog.c:1992
+#: ../app/dialogs/preferences-dialog.c:1817
 msgid "Default New Image"
 msgstr "新しい画像作成時の初期設定"
 
-#: ../app/dialogs/preferences-dialog.c:1995
+#: ../app/dialogs/preferences-dialog.c:1819
 msgid "Default Image"
 msgstr "新しい画像の設定"
 
-#: ../app/dialogs/preferences-dialog.c:2029
+#: ../app/dialogs/preferences-dialog.c:1853
 msgid "Set the default Quick Mask color"
 msgstr "クイックマスク表示色の設定"
 
-#: ../app/dialogs/preferences-dialog.c:2035
+#: ../app/dialogs/preferences-dialog.c:1859
 msgid "Quick Mask color:"
 msgstr "クイックマスク表示色:"
 
-#: ../app/dialogs/preferences-dialog.c:2045
+#: ../app/dialogs/preferences-dialog.c:1869
 msgid "Default Image Grid"
 msgstr "グリッドの設定"
 
-#: ../app/dialogs/preferences-dialog.c:2048
+#: ../app/dialogs/preferences-dialog.c:1871
 msgid "Default Grid"
 msgstr "グリッド"
 
-#: ../app/dialogs/preferences-dialog.c:2068
+#: ../app/dialogs/preferences-dialog.c:1891
 msgid "Image Windows"
 msgstr "画像ウィンドウ"
 
-#: ../app/dialogs/preferences-dialog.c:2083
+#: ../app/dialogs/preferences-dialog.c:1905
 msgid "Use \"_Dot for dot\" by default"
 msgstr "ピクセル等倍で表示(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:2089
+#: ../app/dialogs/preferences-dialog.c:1911
 msgid "Marching _ants speed:"
 msgstr "蟻の行進速度(_A):"
 
 #. Zoom & Resize Behavior
-#: ../app/dialogs/preferences-dialog.c:2093
+#: ../app/dialogs/preferences-dialog.c:1915
 msgid "Zoom & Resize Behavior"
 msgstr "ズームとウィンドウサイズ変更"
 
-#: ../app/dialogs/preferences-dialog.c:2097
+#: ../app/dialogs/preferences-dialog.c:1919
 msgid "Resize window on _zoom"
 msgstr "ズーム時にウィンドウサイズを変更する(_Z)"
 
-#: ../app/dialogs/preferences-dialog.c:2100
+#: ../app/dialogs/preferences-dialog.c:1922
 msgid "Resize window on image _size change"
 msgstr "キャンバスサイズ変更時にウィンドウサイズも変更する(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2106
+#: ../app/dialogs/preferences-dialog.c:1928
 msgid "Fit to window"
 msgstr "ウィンドウに合わせる"
 
-#: ../app/dialogs/preferences-dialog.c:2108
+#: ../app/dialogs/preferences-dialog.c:1930
 msgid "Initial zoom _ratio:"
 msgstr "既定の表示倍率(_R):"
 
 #. Space Bar
-#: ../app/dialogs/preferences-dialog.c:2112
+#: ../app/dialogs/preferences-dialog.c:1934
 msgid "Space Bar"
 msgstr "スペースキー"
 
-#: ../app/dialogs/preferences-dialog.c:2118
+#: ../app/dialogs/preferences-dialog.c:1940
 msgid "_While space bar is pressed:"
 msgstr "スペースキーが押されているとき(_W):"
 
 #. Mouse Pointers
-#: ../app/dialogs/preferences-dialog.c:2122
+#: ../app/dialogs/preferences-dialog.c:1944
 msgid "Mouse Pointers"
 msgstr "マウスポインター"
 
-#: ../app/dialogs/preferences-dialog.c:2126
+#: ../app/dialogs/preferences-dialog.c:1948
 msgid "Show _brush outline"
 msgstr "ブラシの輪郭を表示する(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:2129
-msgid "Show pointer for paint _tools"
+#: ../app/dialogs/preferences-dialog.c:1951
+#, fuzzy
+#| msgid "Show pointer for paint _tools"
+msgid "Show pointer for brush _tools"
 msgstr "描画ツールのポインターを表示する(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:2135
+#: ../app/dialogs/preferences-dialog.c:1957
 msgid "Pointer _mode:"
 msgstr "ポインターのモード(_M):"
 
-#: ../app/dialogs/preferences-dialog.c:2138
-msgid "Pointer re_ndering:"
-msgstr "ポインターの表現方法(_N):"
-
-#: ../app/dialogs/preferences-dialog.c:2141
+#: ../app/dialogs/preferences-dialog.c:1960
 msgid "Pointer _handedness:"
 msgstr "ポインターの表示位置(_H):"
 
-#: ../app/dialogs/preferences-dialog.c:2153
+#: ../app/dialogs/preferences-dialog.c:1972
 msgid "Image Window Appearance"
 msgstr "画像ウィンドウの表示スタイル"
 
-#: ../app/dialogs/preferences-dialog.c:2164
+#: ../app/dialogs/preferences-dialog.c:1982
 msgid "Default Appearance in Normal Mode"
 msgstr "ノーマルモード時の表示アイテム"
 
-#: ../app/dialogs/preferences-dialog.c:2169
+#: ../app/dialogs/preferences-dialog.c:1987
 msgid "Default Appearance in Fullscreen Mode"
 msgstr "フルスクリーンモード時の表示アイテム"
 
-#: ../app/dialogs/preferences-dialog.c:2178
+#: ../app/dialogs/preferences-dialog.c:1996
 msgid "Image Title & Statusbar Format"
 msgstr "画像タイトルとステータスバーの書式"
 
-#: ../app/dialogs/preferences-dialog.c:2181
+#: ../app/dialogs/preferences-dialog.c:1998
 msgid "Title & Status"
 msgstr "タイトルとステータスバー"
 
-#: ../app/dialogs/preferences-dialog.c:2199
+#: ../app/dialogs/preferences-dialog.c:2016
 msgid "Current format"
 msgstr "現在の書式"
 
-#: ../app/dialogs/preferences-dialog.c:2200
+#: ../app/dialogs/preferences-dialog.c:2017
 msgid "Default format"
 msgstr "既定の書式"
 
-#: ../app/dialogs/preferences-dialog.c:2201
+#: ../app/dialogs/preferences-dialog.c:2018
 msgid "Show zoom percentage"
 msgstr "表示倍率 (パーセント) を表示"
 
-#: ../app/dialogs/preferences-dialog.c:2202
+#: ../app/dialogs/preferences-dialog.c:2019
 msgid "Show zoom ratio"
 msgstr "表示倍率 (比率) を表示"
 
-#: ../app/dialogs/preferences-dialog.c:2203
+#: ../app/dialogs/preferences-dialog.c:2020
 msgid "Show image size"
 msgstr "キャンバスサイズを表示"
 
-#: ../app/dialogs/preferences-dialog.c:2216
+#: ../app/dialogs/preferences-dialog.c:2033
 msgid "Image Title Format"
 msgstr "画像タイトルの書式"
 
-#: ../app/dialogs/preferences-dialog.c:2218
+#: ../app/dialogs/preferences-dialog.c:2035
 msgid "Image Statusbar Format"
 msgstr "画像ステータスバーの書式"
 
-#: ../app/dialogs/preferences-dialog.c:2303
+#: ../app/dialogs/preferences-dialog.c:2119
+#, fuzzy
+#| msgid "Image Window Appearance"
+msgid "Image Window Drawing Behavior"
+msgstr "画像ウィンドウの表示スタイル"
+
+#: ../app/dialogs/preferences-dialog.c:2121 ../app/tools/gimpwarpoptions.c:75
+#, fuzzy
+#| msgid "Edge Behavior"
+msgid "Behavior"
+msgstr "境界部分の処理方法"
+
+#: ../app/dialogs/preferences-dialog.c:2129
+#, fuzzy
+#| msgid "Default Appearance in Normal Mode"
+msgid "Default Behavior in Normal Mode"
+msgstr "ノーマルモード時の表示アイテム"
+
+#: ../app/dialogs/preferences-dialog.c:2133
+#, fuzzy
+#| msgid "Default Appearance in Fullscreen Mode"
+msgid "Default Behavior in Fullscreen Mode"
+msgstr "フルスクリーンモード時の表示アイテム"
+
+#: ../app/dialogs/preferences-dialog.c:2142
 msgid "Display"
 msgstr "ディスプレイ"
 
 #. Transparency
-#: ../app/dialogs/preferences-dialog.c:2315
+#: ../app/dialogs/preferences-dialog.c:2153
 msgid "Transparency"
 msgstr "透明部分の表示方法"
 
 # 市松模様だけでなく無地(白・黒・グレー)も選択できるので、「スタイル」のみとした
-#: ../app/dialogs/preferences-dialog.c:2319
+#: ../app/dialogs/preferences-dialog.c:2157
 msgid "_Check style:"
 msgstr "スタイル(_C):"
 
-#: ../app/dialogs/preferences-dialog.c:2322
+#: ../app/dialogs/preferences-dialog.c:2160
 msgid "Check _size:"
 msgstr "市松模様のサイズ(_S):"
 
-#: ../app/dialogs/preferences-dialog.c:2325
+#: ../app/dialogs/preferences-dialog.c:2163
 msgid "Monitor Resolution"
 msgstr "モニター解像度"
 
 #. Pixels
-#: ../app/dialogs/preferences-dialog.c:2329
-#: ../app/display/gimpcursorview.c:206 ../app/widgets/gimpgrideditor.c:200
-#: ../app/widgets/gimpgrideditor.c:232
+#: ../app/dialogs/preferences-dialog.c:2167
+#: ../app/display/gimpcursorview.c:206 ../app/widgets/gimpgrideditor.c:199
+#: ../app/widgets/gimpgrideditor.c:231
 msgid "Pixels"
 msgstr "ピクセル"
 
-#: ../app/dialogs/preferences-dialog.c:2347
+#: ../app/dialogs/preferences-dialog.c:2185
 msgid "Horizontal"
 msgstr "水平"
 
-#: ../app/dialogs/preferences-dialog.c:2349
+#: ../app/dialogs/preferences-dialog.c:2187
 msgid "Vertical"
 msgstr "垂直"
 
-#: ../app/dialogs/preferences-dialog.c:2351
-#: ../app/widgets/gimpimagepropview.c:474
+#: ../app/dialogs/preferences-dialog.c:2189
+#: ../app/widgets/gimpimagepropview.c:472
 msgid "ppi"
 msgstr "dpi"
 
-#: ../app/dialogs/preferences-dialog.c:2367
+#: ../app/dialogs/preferences-dialog.c:2205
 #, c-format
 msgid "_Detect automatically (currently %d × %d ppi)"
 msgstr "自動検出(_D) (現在 %d × %d dpi)"
 
-#: ../app/dialogs/preferences-dialog.c:2385
+#: ../app/dialogs/preferences-dialog.c:2223
 msgid "_Enter manually"
 msgstr "手動設定(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:2400
+#: ../app/dialogs/preferences-dialog.c:2238
 msgid "C_alibrate..."
 msgstr "測定(_A)..."
 
-#: ../app/dialogs/preferences-dialog.c:2428
+#: ../app/dialogs/preferences-dialog.c:2266
 msgid "Color Management"
 msgstr "カラーマネジメント"
 
-#: ../app/dialogs/preferences-dialog.c:2448
+#: ../app/dialogs/preferences-dialog.c:2285
 msgid "_RGB profile:"
 msgstr "RGB プロファイル(_R):"
 
-#: ../app/dialogs/preferences-dialog.c:2449
+#: ../app/dialogs/preferences-dialog.c:2286
 msgid "Select RGB Color Profile"
 msgstr "RGB プロファイルの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2450
+#: ../app/dialogs/preferences-dialog.c:2287
 msgid "_CMYK profile:"
 msgstr "CMYK プロファイル(_C):"
 
-#: ../app/dialogs/preferences-dialog.c:2451
+#: ../app/dialogs/preferences-dialog.c:2288
 msgid "Select CMYK Color Profile"
 msgstr "CMYK プロファイルの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2452
+#: ../app/dialogs/preferences-dialog.c:2289
 msgid "_Monitor profile:"
 msgstr "モニタープロファイル(_M):"
 
-#: ../app/dialogs/preferences-dialog.c:2453
+#: ../app/dialogs/preferences-dialog.c:2290
 msgid "Select Monitor Color Profile"
 msgstr "モニタープロファイルの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2454
+#: ../app/dialogs/preferences-dialog.c:2291
 msgid "_Print simulation profile:"
 msgstr "シミュレーション対象のプロファイル(_P):"
 
-#: ../app/dialogs/preferences-dialog.c:2455
+#: ../app/dialogs/preferences-dialog.c:2292
 msgid "Select Printer Color Profile"
 msgstr "シミュレーション対象のプロファイルの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2466
+#: ../app/dialogs/preferences-dialog.c:2303
 msgid "_Mode of operation:"
 msgstr "表示モード(_M):"
 
-#: ../app/dialogs/preferences-dialog.c:2496
+#: ../app/dialogs/preferences-dialog.c:2333
 msgid "_Try to use the system monitor profile"
 msgstr "システムのモニタープロファイル使用を優先する(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:2506
+#: ../app/dialogs/preferences-dialog.c:2343
 msgid "_Display rendering intent:"
 msgstr "モニター表示のレンダリングインテント(_D):"
 
-#: ../app/dialogs/preferences-dialog.c:2515
+#: ../app/dialogs/preferences-dialog.c:2352
 msgid "_Softproof rendering intent:"
 msgstr "ソフトプルーフのレンダリングインテント(_S):"
 
-#: ../app/dialogs/preferences-dialog.c:2528
+#: ../app/dialogs/preferences-dialog.c:2365
 msgid "Mark out of gamut colors"
 msgstr "色域外の色をマーキングする"
 
-#: ../app/dialogs/preferences-dialog.c:2533
+#: ../app/dialogs/preferences-dialog.c:2370
 msgid "Select Warning Color"
 msgstr "マーキング色の選択"
 
-#: ../app/dialogs/preferences-dialog.c:2546
+#: ../app/dialogs/preferences-dialog.c:2383
 msgid "File Open behaviour:"
 msgstr "ファイルを開く時の挙動:"
 
-#: ../app/dialogs/preferences-dialog.c:2558
+#: ../app/dialogs/preferences-dialog.c:2395
 msgid "Input Devices"
 msgstr "入力デバイス"
 
 #. Extended Input Devices
-#: ../app/dialogs/preferences-dialog.c:2568
+#: ../app/dialogs/preferences-dialog.c:2404
 msgid "Extended Input Devices"
 msgstr "追加入力デバイス"
 
-#: ../app/dialogs/preferences-dialog.c:2572
+#: ../app/dialogs/preferences-dialog.c:2408
 msgid "Configure E_xtended Input Devices..."
 msgstr "追加された入力デバイスの設定(_X)..."
 
-#: ../app/dialogs/preferences-dialog.c:2579
+#: ../app/dialogs/preferences-dialog.c:2415
 msgid "_Save input device settings on exit"
 msgstr "入力デバイスの設定を終了時に保存する(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2583
+#: ../app/dialogs/preferences-dialog.c:2419
 msgid "Save Input Device Settings _Now"
 msgstr "今すぐ入力デバイス設定を保存(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:2590
+#: ../app/dialogs/preferences-dialog.c:2426
 msgid "_Reset Saved Input Device Settings to Default Values"
 msgstr "入力デバイス設定のリセット(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:2605
+#: ../app/dialogs/preferences-dialog.c:2441
 msgid "Additional Input Controllers"
 msgstr "入力コントローラーの追加"
 
-#: ../app/dialogs/preferences-dialog.c:2608
+#: ../app/dialogs/preferences-dialog.c:2443
 msgid "Input Controllers"
 msgstr "入力コントローラー"
 
-#: ../app/dialogs/preferences-dialog.c:2624
+#: ../app/dialogs/preferences-dialog.c:2459
 msgid "Window Management"
 msgstr "ウィンドウの設定"
 
-#: ../app/dialogs/preferences-dialog.c:2633
+#: ../app/dialogs/preferences-dialog.c:2467
 msgid "Window Manager Hints"
 msgstr "ウィンドウマネージャーのヒント"
 
-#: ../app/dialogs/preferences-dialog.c:2639
+#: ../app/dialogs/preferences-dialog.c:2473
 msgid "Hint for _docks and toolbox:"
 msgstr "ドックとツールボックスのヒント(_D):"
 
-#: ../app/dialogs/preferences-dialog.c:2642
+#: ../app/dialogs/preferences-dialog.c:2476
 msgid "Focus"
 msgstr "フォーカス"
 
-#: ../app/dialogs/preferences-dialog.c:2646
+#: ../app/dialogs/preferences-dialog.c:2480
 msgid "Activate the _focused image"
 msgstr "フォーカスされた画像をアクティブにする(_F)"
 
 #. Window Positions
-#: ../app/dialogs/preferences-dialog.c:2650
+#: ../app/dialogs/preferences-dialog.c:2484
 msgid "Window Positions"
 msgstr "ウィンドウ位置"
 
-#: ../app/dialogs/preferences-dialog.c:2653
+#: ../app/dialogs/preferences-dialog.c:2487
 msgid "_Save window positions on exit"
 msgstr "終了時にウィンドウの位置を保存する(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2657
+#: ../app/dialogs/preferences-dialog.c:2491
 msgid "Save Window Positions _Now"
 msgstr "今すぐウィンドウ位置を保存(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:2664
+#: ../app/dialogs/preferences-dialog.c:2498
 msgid "_Reset Saved Window Positions to Default Values"
 msgstr "保存済ウィンドウ位置のリセット(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:2679
+#: ../app/dialogs/preferences-dialog.c:2513
 msgid "Folders"
 msgstr "フォルダー"
 
-#: ../app/dialogs/preferences-dialog.c:2699
+#: ../app/dialogs/preferences-dialog.c:2532
 msgid "Temporary folder:"
 msgstr "一時フォルダー:"
 
-#: ../app/dialogs/preferences-dialog.c:2700
+#: ../app/dialogs/preferences-dialog.c:2533
 msgid "Select Folder for Temporary Files"
 msgstr "一時ファイル用フォルダーを選択します"
 
-#: ../app/dialogs/preferences-dialog.c:2704
+#: ../app/dialogs/preferences-dialog.c:2537
 msgid "Swap folder:"
 msgstr "スワップ用フォルダー:"
 
-#: ../app/dialogs/preferences-dialog.c:2705
+#: ../app/dialogs/preferences-dialog.c:2538
 msgid "Select Swap Folder"
 msgstr "スワップ用フォルダーの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2740
+#: ../app/dialogs/preferences-dialog.c:2573
 msgid "Brush Folders"
 msgstr "ブラシ用フォルダー"
 
-#: ../app/dialogs/preferences-dialog.c:2742
+#: ../app/dialogs/preferences-dialog.c:2575
 msgid "Select Brush Folders"
 msgstr "ブラシ用フォルダーの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2744
+#: ../app/dialogs/preferences-dialog.c:2577
 msgid "Dynamics Folders"
 msgstr "動的特性用フォルダー"
 
-#: ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/preferences-dialog.c:2579
 msgid "Select Dynamics Folders"
 msgstr "動的特性用フォルダーの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2581
 msgid "Pattern Folders"
 msgstr "パターン用フォルダー"
 
-#: ../app/dialogs/preferences-dialog.c:2750
+#: ../app/dialogs/preferences-dialog.c:2583
 msgid "Select Pattern Folders"
 msgstr "パターン用フォルダーの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2752
+#: ../app/dialogs/preferences-dialog.c:2585
 msgid "Palette Folders"
 msgstr "パレット用フォルダー"
 
-#: ../app/dialogs/preferences-dialog.c:2754
+#: ../app/dialogs/preferences-dialog.c:2587
 msgid "Select Palette Folders"
 msgstr "パレット用フォルダーの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2756
+#: ../app/dialogs/preferences-dialog.c:2589
 msgid "Gradient Folders"
 msgstr "グラデーション用フォルダー"
 
-#: ../app/dialogs/preferences-dialog.c:2758
+#: ../app/dialogs/preferences-dialog.c:2591
 msgid "Select Gradient Folders"
 msgstr "グラデーション用フォルダーの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/dialogs/preferences-dialog.c:2593
 msgid "Font Folders"
 msgstr "フォント用フォルダー"
 
-#: ../app/dialogs/preferences-dialog.c:2762
+#: ../app/dialogs/preferences-dialog.c:2595
 msgid "Select Font Folders"
 msgstr "フォント用フォルダーの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2764
+#: ../app/dialogs/preferences-dialog.c:2597
 msgid "Tool Preset Folders"
 msgstr "ツールプリセット用フォルダー"
 
-#: ../app/dialogs/preferences-dialog.c:2766
+#: ../app/dialogs/preferences-dialog.c:2599
 msgid "Select Tool Preset Folders"
 msgstr "ツールプリセット用フォルダーの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2768
+#: ../app/dialogs/preferences-dialog.c:2601
 msgid "Plug-In Folders"
 msgstr "プラグイン用フォルダー"
 
-#: ../app/dialogs/preferences-dialog.c:2770
+#: ../app/dialogs/preferences-dialog.c:2603
 msgid "Select Plug-In Folders"
 msgstr "プラグイン用フォルダーの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2772
+#: ../app/dialogs/preferences-dialog.c:2605
 msgid "Scripts"
 msgstr "スクリプト"
 
-#: ../app/dialogs/preferences-dialog.c:2772
+#: ../app/dialogs/preferences-dialog.c:2605
 msgid "Script-Fu Folders"
 msgstr "スクリプト用フォルダー"
 
-#: ../app/dialogs/preferences-dialog.c:2774
+#: ../app/dialogs/preferences-dialog.c:2607
 msgid "Select Script-Fu Folders"
 msgstr "スクリプト用フォルダーの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2776
+#: ../app/dialogs/preferences-dialog.c:2609
 msgid "Module Folders"
 msgstr "モジュール用フォルダー"
 
-#: ../app/dialogs/preferences-dialog.c:2778
+#: ../app/dialogs/preferences-dialog.c:2611
 msgid "Select Module Folders"
 msgstr "モジュール用フォルダーの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2780
+#: ../app/dialogs/preferences-dialog.c:2613
 msgid "Interpreters"
 msgstr "インタープリター"
 
-#: ../app/dialogs/preferences-dialog.c:2780
+#: ../app/dialogs/preferences-dialog.c:2613
 msgid "Interpreter Folders"
 msgstr "インタープリター用フォルダー"
 
-#: ../app/dialogs/preferences-dialog.c:2782
+#: ../app/dialogs/preferences-dialog.c:2615
 msgid "Select Interpreter Folders"
 msgstr "インタープリター用フォルダーの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2784
+#: ../app/dialogs/preferences-dialog.c:2617
 msgid "Environment Folders"
 msgstr "設定保存用フォルダー"
 
-#: ../app/dialogs/preferences-dialog.c:2786
+#: ../app/dialogs/preferences-dialog.c:2619
 msgid "Select Environment Folders"
 msgstr "設定を保存するフォルダーの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2788
+#: ../app/dialogs/preferences-dialog.c:2621
 msgid "Themes"
 msgstr "テーマ"
 
-#: ../app/dialogs/preferences-dialog.c:2788
+#: ../app/dialogs/preferences-dialog.c:2621
 msgid "Theme Folders"
 msgstr "テーマ用フォルダー"
 
-#: ../app/dialogs/preferences-dialog.c:2790
+#: ../app/dialogs/preferences-dialog.c:2623
 msgid "Select Theme Folders"
 msgstr "テーマ用フォルダーの選択"
 
@@ -10593,23 +11418,23 @@ msgstr "印刷サイズ"
 
 #. the image size labels
 #: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:193
-#: ../app/widgets/gimptemplateeditor.c:181
+#: ../app/widgets/gimptemplateeditor.c:180
 msgid "_Width:"
 msgstr "幅(_W):"
 
 #: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:197
-#: ../app/widgets/gimptemplateeditor.c:188
+#: ../app/widgets/gimptemplateeditor.c:187
 msgid "H_eight:"
 msgstr "高さ(_E):"
 
 #. the resolution labels
 #: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:255
-#: ../app/widgets/gimptemplateeditor.c:310
+#: ../app/widgets/gimptemplateeditor.c:309
 msgid "_X resolution:"
 msgstr "水平解像度(_X):"
 
 #: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:258
-#: ../app/widgets/gimptemplateeditor.c:317
+#: ../app/widgets/gimptemplateeditor.c:316
 msgid "_Y resolution:"
 msgstr "垂直解像度(_Y):"
 
@@ -10618,68 +11443,100 @@ msgstr "垂直解像度(_Y):"
 msgid "pixels/%a"
 msgstr "ピクセル/%a"
 
-#: ../app/dialogs/quit-dialog.c:105
+#: ../app/dialogs/quit-dialog.c:145
 msgid "Quit GIMP"
 msgstr "GIMPを終了します"
 
-#: ../app/dialogs/quit-dialog.c:105
+#: ../app/dialogs/quit-dialog.c:145
 msgid "Close All Images"
 msgstr "すべての画像を閉じる"
 
-#: ../app/dialogs/quit-dialog.c:164
+#: ../app/dialogs/quit-dialog.c:213
 msgid "If you quit GIMP now, these changes will be lost."
 msgstr "このままGIMPを終了すると、画像への変更が破棄されます。"
 
-#: ../app/dialogs/quit-dialog.c:167
+#: ../app/dialogs/quit-dialog.c:216
 msgid "If you close these images now, changes will be lost."
 msgstr "このまま閉じると、画像に加えた変更は破棄されます。"
 
-#: ../app/dialogs/quit-dialog.c:214
+#: ../app/dialogs/quit-dialog.c:301
 #, c-format
 msgid "There is one image with unsaved changes:"
 msgid_plural "There are %d images with unsaved changes:"
 msgstr[0] "以下の %d 個の画像は保存されていません。"
 
-#: ../app/dialogs/quit-dialog.c:236
+#: ../app/dialogs/quit-dialog.c:312
+#, c-format
+msgid "Press %s to quit."
+msgstr "終了するには %s キーを押します。"
+
+#: ../app/dialogs/quit-dialog.c:315
+#, c-format
+msgid "Press %s to close all images."
+msgstr "画像をすべて閉じるには %s キーを押します。"
+
+#: ../app/dialogs/quit-dialog.c:331
+#, c-format
+msgid "Press %s to discard all changes and quit."
+msgstr "変更を破棄し終了するには %s キーを押します。"
+
+#: ../app/dialogs/quit-dialog.c:334
+#, c-format
+msgid "Press %s to discard all changes and close all images."
+msgstr "変更を破棄し画像をすべて閉じるには %s キーを押します。"
+
+#: ../app/dialogs/quit-dialog.c:342
+#: ../app/display/gimpdisplayshell-close.c:180
 msgid "_Discard Changes"
 msgstr "保存しない(_D)"
 
-#: ../app/dialogs/resize-dialog.c:119
+#: ../app/dialogs/quit-dialog.c:424
+#, c-format
+msgid "Exported to %s"
+msgstr "%s にエクスポート済み"
+
+#: ../app/dialogs/resize-dialog.c:120
 msgid "Canvas Size"
 msgstr "キャンバスサイズ"
 
-#: ../app/dialogs/resize-dialog.c:130 ../app/dialogs/scale-dialog.c:109
+#: ../app/dialogs/resize-dialog.c:131 ../app/dialogs/scale-dialog.c:109
 msgid "Layer Size"
 msgstr "レイヤーサイズ"
 
-#: ../app/dialogs/resize-dialog.c:295
+#: ../app/dialogs/resize-dialog.c:301
 msgid "Resize _layers:"
 msgstr "サイズ変更するレイヤー(_L):"
 
-#: ../app/dialogs/resolution-calibrate-dialog.c:69
+#: ../app/dialogs/resize-dialog.c:316
+#, fuzzy
+#| msgid "Resize Text Layer"
+msgid "Resize _text layers"
+msgstr "テキストレイヤーサイズの変更"
+
+#: ../app/dialogs/resolution-calibrate-dialog.c:70
 msgid "Calibrate Monitor Resolution"
 msgstr "モニター解像度測定"
 
-#: ../app/dialogs/resolution-calibrate-dialog.c:128
+#: ../app/dialogs/resolution-calibrate-dialog.c:129
 msgid "Measure the rulers and enter their lengths:"
 msgstr ""
 "画面に物差しをあててスケールの長さを実際に測り、その結果を下の枠に入力してく"
 "ださい"
 
-#: ../app/dialogs/resolution-calibrate-dialog.c:153
+#: ../app/dialogs/resolution-calibrate-dialog.c:154
 msgid "_Horizontal:"
 msgstr "水平(_H):"
 
-#: ../app/dialogs/resolution-calibrate-dialog.c:158
+#: ../app/dialogs/resolution-calibrate-dialog.c:159
 msgid "_Vertical:"
 msgstr "垂直(_V):"
 
 #. Image size frame
-#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:159
+#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:158
 msgid "Image Size"
 msgstr "キャンバスサイズ (画像サイズ)"
 
-#: ../app/dialogs/scale-dialog.c:176 ../app/tools/gimppaintoptions-gui.c:394
+#: ../app/dialogs/scale-dialog.c:176 ../app/tools/gimppaintoptions-gui.c:391
 msgid "Quality"
 msgstr "品質"
 
@@ -10707,39 +11564,39 @@ msgstr "描画ツール:"
 msgid "_Emulate brush dynamics"
 msgstr "描画の動的特性をエミュレートする(_E)"
 
-#: ../app/dialogs/tips-dialog.c:88
+#: ../app/dialogs/tips-dialog.c:89
 msgid "The GIMP tips file is empty!"
 msgstr "「GIMP 今日の技」のファイルが空です。"
 
-#: ../app/dialogs/tips-dialog.c:92
+#: ../app/dialogs/tips-dialog.c:93
 msgid "The GIMP tips file appears to be missing!"
 msgstr "「GIMP 今日の技」のファイルが見つかりません。"
 
-#: ../app/dialogs/tips-dialog.c:94
+#: ../app/dialogs/tips-dialog.c:95
 #, c-format
 msgid "There should be a file called '%s'. Please check your installation."
 msgstr ""
 "'%s' というファイルがなければなりません。GIMP が正しくインストールされている"
 "か確認してください。"
 
-#: ../app/dialogs/tips-dialog.c:100
+#: ../app/dialogs/tips-dialog.c:101
 msgid "The GIMP tips file could not be parsed!"
 msgstr "「GIMP 今日の技」のファイルが解析できません"
 
-#: ../app/dialogs/tips-dialog.c:128
+#: ../app/dialogs/tips-dialog.c:129
 msgid "GIMP Tip of the Day"
 msgstr "GIMP 今日の技"
 
-#: ../app/dialogs/tips-dialog.c:134
+#: ../app/dialogs/tips-dialog.c:135
 msgid "_Previous Tip"
 msgstr "前の技(_P)"
 
-#: ../app/dialogs/tips-dialog.c:140
+#: ../app/dialogs/tips-dialog.c:141
 msgid "_Next Tip"
 msgstr "次の技(_N)"
 
 #. a link to the related section in the user manual
-#: ../app/dialogs/tips-dialog.c:193
+#: ../app/dialogs/tips-dialog.c:194
 msgid "Learn more"
 msgstr "詳しくはこちら"
 
@@ -10752,21 +11609,21 @@ msgstr "詳しくはこちら"
 msgid "tips-locale:C"
 msgstr "tips-locale:ja"
 
-#: ../app/dialogs/user-install-dialog.c:84
+#: ../app/dialogs/user-install-dialog.c:85
 msgid "GIMP User Installation"
 msgstr "GIMP ユーザーインストール"
 
-#: ../app/dialogs/user-install-dialog.c:93
+#: ../app/dialogs/user-install-dialog.c:94
 msgid "User installation failed!"
 msgstr "ユーザーインストールに失敗"
 
-#: ../app/dialogs/user-install-dialog.c:95
+#: ../app/dialogs/user-install-dialog.c:96
 msgid "The GIMP user installation failed; see the log for details."
 msgstr ""
 "ユーザーインストールに失敗しました。詳細についてはログファイルをご覧くださ"
 "い。"
 
-#: ../app/dialogs/user-install-dialog.c:98
+#: ../app/dialogs/user-install-dialog.c:99
 msgid "Installation Log"
 msgstr "ユーザーインストールのログ"
 
@@ -10787,7 +11644,7 @@ msgid "Import Paths from SVG"
 msgstr "SVG からパスをインポート"
 
 #: ../app/dialogs/vectors-import-dialog.c:92
-#: ../app/widgets/gimpprofilechooserdialog.c:122
+#: ../app/widgets/gimpprofilechooserdialog.c:121
 msgid "All files (*.*)"
 msgstr "すべてのファイル (*.*)"
 
@@ -10855,7 +11712,7 @@ msgstr "グリッド間隔を指定"
 #: ../app/display/gimpcursorview.c:674 ../app/display/gimpcursorview.c:675
 #: ../app/display/gimpcursorview.c:788 ../app/display/gimpcursorview.c:789
 #: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791
-#: ../app/widgets/gimpcolorframe.c:633
+#: ../app/widgets/gimpcolorframe.c:684
 msgid "n/a"
 msgstr "n/a"
 
@@ -10895,24 +11752,24 @@ msgstr "高"
 msgid "_Sample Merged"
 msgstr "見えている色の情報を表示(_S)"
 
-#: ../app/display/gimpdisplayshell.c:508
+#: ../app/display/gimpdisplayshell.c:520
 msgid "Access the image menu"
 msgstr "画像メニューにアクセス"
 
-#: ../app/display/gimpdisplayshell.c:622
+#: ../app/display/gimpdisplayshell.c:631
 msgid "Zoom image when window size changes"
 msgstr "ウィンドウサイズ変更時に画像をズーム"
 
-#: ../app/display/gimpdisplayshell.c:651
+#: ../app/display/gimpdisplayshell.c:660
 msgid "Toggle Quick Mask"
 msgstr "クイックマスクの切り替え"
 
-#: ../app/display/gimpdisplayshell.c:674
+#: ../app/display/gimpdisplayshell.c:683
 msgid "Navigate the image display"
 msgstr "この画像のナビゲーションプレビューを表示します"
 
-#: ../app/display/gimpdisplayshell.c:742
-#: ../app/display/gimpdisplayshell.c:1320 ../app/widgets/gimptoolbox.c:257
+#: ../app/display/gimpdisplayshell.c:755
+#: ../app/display/gimpdisplayshell.c:1366 ../app/widgets/gimptoolbox.c:252
 msgid "Drop image files here to open them"
 msgstr ""
 "ここにファイルアイコンをドロップすると、そのファイルを画像として開きます。 "
@@ -10920,22 +11777,23 @@ msgstr ""
 "画像を開いているウィンドウにファイルアイコンをドロップしたときは、そのファイ"
 "ルをレイヤーとして開きます。"
 
-#: ../app/display/gimpdisplayshell-close.c:153
-#: ../app/display/gimpdisplayshell-close.c:223
+#: ../app/display/gimpdisplayshell-close.c:169
+#: ../app/display/gimpdisplayshell-close.c:269
 #, c-format
 msgid "Close %s"
 msgstr "%s を閉じる"
 
-#: ../app/display/gimpdisplayshell-close.c:164
-msgid "Close _without Saving"
-msgstr "保存せずに閉じる(_W)"
+#: ../app/display/gimpdisplayshell-close.c:217
+#, c-format
+msgid "Press %s to discard all changes and close the image."
+msgstr "変更を破棄し画像を閉じるには %s キーを押します。"
 
-#: ../app/display/gimpdisplayshell-close.c:231
+#: ../app/display/gimpdisplayshell-close.c:277
 #, c-format
 msgid "Save the changes to image '%s' before closing?"
 msgstr "画像 '%s' の変更を保存しますか?"
 
-#: ../app/display/gimpdisplayshell-close.c:254
+#: ../app/display/gimpdisplayshell-close.c:310
 #, c-format
 msgid "If you don't save the image, changes from the last hour will be lost."
 msgid_plural ""
@@ -10944,7 +11802,7 @@ msgstr[0] ""
 "保存しない場合は %d 時間前からの変更が破棄されます。\n"
 "(このメッセージは画像の変更を xcf 形式で保存していない場合に表示されます。)"
 
-#: ../app/display/gimpdisplayshell-close.c:264
+#: ../app/display/gimpdisplayshell-close.c:321
 #, c-format
 msgid ""
 "If you don't save the image, changes from the last hour and %d minute will "
@@ -10956,7 +11814,7 @@ msgstr[0] ""
 "保存しない場合は 1 時間 %d 分前からの変更が破棄されます。\n"
 "(このメッセージは画像の変更を xcf 形式で保存していない場合に表示されます。)"
 
-#: ../app/display/gimpdisplayshell-close.c:275
+#: ../app/display/gimpdisplayshell-close.c:333
 #, c-format
 msgid "If you don't save the image, changes from the last minute will be lost."
 msgid_plural ""
@@ -10965,62 +11823,71 @@ msgstr[0] ""
 "保存しない場合は %d 分前からの変更が破棄されます。\n"
 "(このメッセージは画像の変更を xcf 形式で保存していない場合に表示されます。)"
 
-#: ../app/display/gimpdisplayshell-dnd.c:231
-#: ../app/display/gimpdisplayshell-dnd.c:631
-#: ../app/display/gimpdisplayshell-dnd.c:688
+#: ../app/display/gimpdisplayshell-close.c:354
+#, c-format
+msgid "The image has been exported to '%s'."
+msgstr "画像は '%s' にエクスポートされています。"
+
+#: ../app/display/gimpdisplayshell-dnd.c:245
+#: ../app/display/gimpdisplayshell-dnd.c:645
+#: ../app/display/gimpdisplayshell-dnd.c:702
 msgid "Drop New Layer"
 msgstr "新しいレイヤーをドロップ"
 
-#: ../app/display/gimpdisplayshell-dnd.c:274
+#: ../app/display/gimpdisplayshell-dnd.c:288
 msgid "Drop New Path"
 msgstr "新しいパスをドロップ"
 
-#: ../app/display/gimpdisplayshell-dnd.c:346
-#: ../app/display/gimpdisplayshell-dnd.c:445 ../app/tools/gimpblendtool.c:166
-#: ../app/tools/gimpbucketfilltool.c:137 ../app/tools/gimpimagemaptool.c:289
+#: ../app/display/gimpdisplayshell-dnd.c:360
+#: ../app/display/gimpdisplayshell-dnd.c:459 ../app/tools/gimpblendtool.c:166
+#: ../app/tools/gimpbucketfilltool.c:137 ../app/tools/gimpimagemaptool.c:288
+#: ../app/tools/gimpselectiontool.c:427
 msgid "Cannot modify the pixels of layer groups."
 msgstr "レイヤーグループのピクセルは変更できません。"
 
-#: ../app/display/gimpdisplayshell-dnd.c:354
-#: ../app/display/gimpdisplayshell-dnd.c:453 ../app/tools/gimpblendtool.c:173
+#: ../app/display/gimpdisplayshell-dnd.c:368
+#: ../app/display/gimpdisplayshell-dnd.c:467 ../app/tools/gimpblendtool.c:173
 #: ../app/tools/gimpbucketfilltool.c:144 ../app/tools/gimpcroptool.c:325
-#: ../app/tools/gimpimagemaptool.c:296 ../app/tools/gimppainttool.c:266
-#: ../app/tools/gimptransformtool.c:244 ../app/tools/gimptransformtool.c:1064
+#: ../app/tools/gimpimagemaptool.c:295 ../app/tools/gimppainttool.c:265
+#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:272
+#: ../app/tools/gimptransformtool.c:1369
 msgid "The active layer's pixels are locked."
 msgstr "アクティブレイヤー中のすべてのピクセルが保護されています。"
 
-#: ../app/display/gimpdisplayshell-dnd.c:373
-#: ../app/widgets/gimpdrawabletreeview.c:241
-#: ../app/widgets/gimpdrawabletreeview.c:329
+#: ../app/display/gimpdisplayshell-dnd.c:387
+#: ../app/widgets/gimpdrawabletreeview.c:242
+#: ../app/widgets/gimpdrawabletreeview.c:330
 #, fuzzy
+#| msgid "Drop New Layer"
 msgctxt "undo-type"
 msgid "Drop pattern to layer"
 msgstr "新しいレイヤーをドロップ"
 
-#: ../app/display/gimpdisplayshell-dnd.c:374
-#: ../app/widgets/gimpdrawabletreeview.c:265
-#: ../app/widgets/gimpdrawabletreeview.c:330
+#: ../app/display/gimpdisplayshell-dnd.c:388
+#: ../app/widgets/gimpdrawabletreeview.c:266
+#: ../app/widgets/gimpdrawabletreeview.c:331
 #, fuzzy
+#| msgid "Drop layers"
 msgctxt "undo-type"
 msgid "Drop color to layer"
 msgstr "レイヤーをドロップ"
 
-#: ../app/display/gimpdisplayshell-dnd.c:531
-#: ../app/widgets/gimplayertreeview.c:725
+#: ../app/display/gimpdisplayshell-dnd.c:545
+#: ../app/widgets/gimplayertreeview.c:727
 msgid "Drop layers"
 msgstr "レイヤーをドロップ"
 
-#: ../app/display/gimpdisplayshell-dnd.c:664
-#: ../app/display/gimpdisplayshell-dnd.c:680
-#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:266
+#: ../app/display/gimpdisplayshell-dnd.c:678
+#: ../app/display/gimpdisplayshell-dnd.c:694
+#: ../app/widgets/gimplayertreeview.c:804 ../app/widgets/gimptoolbox-dnd.c:264
 msgid "Dropped Buffer"
 msgstr "ドロップされたバッファー"
 
-#: ../app/display/gimpdisplayshell-filter-dialog.c:78
+#: ../app/display/gimpdisplayshell-filter-dialog.c:83
 msgid "Color Display Filters"
 msgstr "カラーディスプレイフィルター"
 
-#: ../app/display/gimpdisplayshell-filter-dialog.c:81
+#: ../app/display/gimpdisplayshell-filter-dialog.c:86
 msgid "Configure Color Display Filters"
 msgstr "カラーディスプレイフィルターの設定"
 
@@ -11038,6 +11905,31 @@ msgstr "画像は '%s' として保存されました"
 msgid "Layer Select"
 msgstr "レイヤー選択"
 
+#: ../app/display/gimpdisplayshell-rotate-dialog.c:102
+#, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Rotate image"
+msgid "Rotate View"
+msgstr "画像の回転"
+
+#: ../app/display/gimpdisplayshell-rotate-dialog.c:104
+#, fuzzy
+#| msgctxt "layers-action"
+#| msgid "Select _Bottom Layer"
+msgid "Select Rotation Angle"
+msgstr "最背面レイヤーの選択(_B)"
+
+#: ../app/display/gimpdisplayshell-rotate-dialog.c:141
+#: ../app/tools/gimpmeasuretool.c:1095
+msgid "Angle:"
+msgstr "角度:"
+
+#: ../app/display/gimpdisplayshell-rotate-dialog.c:154
+#, fuzzy
+#| msgid "15 degrees  (%s)"
+msgid "degrees"
+msgstr "15 度ずつ回転  (%s)"
+
 #: ../app/display/gimpdisplayshell-scale-dialog.c:115
 msgid "Zoom Ratio"
 msgstr "表示倍率"
@@ -11054,66 +11946,51 @@ msgstr "表示比:"
 msgid "Zoom:"
 msgstr "表示倍率:"
 
-#: ../app/display/gimpdisplayshell-title.c:305
+#: ../app/display/gimpdisplayshell-title.c:286
 msgid "(modified)"
 msgstr "(修正済み)"
 
-#: ../app/display/gimpdisplayshell-title.c:310
+#: ../app/display/gimpdisplayshell-title.c:291
 msgid "(clean)"
 msgstr "(消去)"
 
-#: ../app/display/gimpdisplayshell-title.c:361
-#: ../app/display/gimpdisplayshell-title.c:374
-#: ../app/widgets/gimpactiongroup.c:861
+#: ../app/display/gimpdisplayshell-title.c:342
+#: ../app/display/gimpdisplayshell-title.c:355
+#: ../app/widgets/gimpactiongroup.c:860
 msgid "(none)"
 msgstr "(なし)"
 
-# 編集画像をエクスポートした後の画像ウィンドウに表示される
-#: ../app/display/gimpdisplayshell-title.c:503
-msgid " (exported)"
-msgstr " (エクスポート済み)"
-
-# 編集画像を上書きエクスポートした後の画像ウィンドウに表示される
-#: ../app/display/gimpdisplayshell-title.c:505
-msgid " (overwritten)"
-msgstr " (上書き済み)"
-
-# 画像ファイルを開き(インポート)一度も [保存]、[名前を付けて保存] をしていない間に、ウィンドウタイトルにこの表記が使用される。
-#: ../app/display/gimpdisplayshell-title.c:511
-msgid " (imported)"
-msgstr " (インポートされた画像)"
-
-#: ../app/display/gimpstatusbar.c:356
+#: ../app/display/gimpstatusbar.c:374
 #, c-format
 msgid "Cancel <i>%s</i>"
 msgstr "<i>%s</i> をキャンセル"
 
-#: ../app/file/file-open.c:138 ../app/file/file-save.c:114
+#: ../app/file/file-open.c:139 ../app/file/file-save.c:118
 msgid "Not a regular file"
 msgstr "通常のファイルではありません"
 
-#: ../app/file/file-open.c:191
+#: ../app/file/file-open.c:198
 #, c-format
 msgid "%s plug-in returned SUCCESS but did not return an image"
 msgstr "%s プラグインは SUCCESS を返しましたが、画像が返ってきません"
 
-#: ../app/file/file-open.c:202
+#: ../app/file/file-open.c:209
 #, c-format
 msgid "%s plug-In could not open image"
 msgstr "%s プラグインは画像を開けられません"
 
-#: ../app/file/file-open.c:567
+#: ../app/file/file-open.c:583
 msgid "Image doesn't contain any layers"
 msgstr "画像にレイヤーがありません"
 
-#: ../app/file/file-open.c:620
+#: ../app/file/file-open.c:639
 #, c-format
 msgid "Opening '%s' failed: %s"
 msgstr ""
 "'%s' のオープンに失敗しました。\n"
 "%s"
 
-#: ../app/file/file-open.c:727
+#: ../app/file/file-open.c:753
 msgid ""
 "Color management has been disabled. It can be enabled again in the "
 "Preferences dialog."
@@ -11121,133 +11998,176 @@ msgstr ""
 "カラーマネジメントが無効になっています。(設定ダイアログで再び有効にすることが"
 "できます。)"
 
-#: ../app/file/file-procedure.c:195
+#: ../app/file/file-procedure.c:210
 msgid "Unknown file type"
 msgstr "ファイル形式が不明、または画像として開くことができない形式です。"
 
-#: ../app/file/file-save.c:210
+#: ../app/file/file-save.c:231
 #, c-format
 msgid "%s plug-in could not save image"
 msgstr "%s プラグインは画像を保存できません"
 
-#: ../app/file/file-utils.c:74
+#: ../app/file/file-utils.c:72
 #, c-format
 msgid "'%s:' is not a valid URI scheme"
 msgstr "'%s:' は、不正な URI スキームです"
 
-#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126
+#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124
 msgid "Invalid character sequence in URI"
 msgstr "URI 中に不適切な文字列が含まれます"
 
-#: ../app/gegl/gimp-babl.c:154 ../app/gegl/gimp-babl.c:155
-#: ../app/gegl/gimp-babl.c:156 ../app/gegl/gimp-babl.c:157
-#: ../app/gegl/gimp-babl.c:158
+#: ../app/gegl/gimp-babl.c:229 ../app/gegl/gimp-babl.c:230
+#: ../app/gegl/gimp-babl.c:231 ../app/gegl/gimp-babl.c:232
+#: ../app/gegl/gimp-babl.c:233 ../app/gegl/gimp-babl.c:234
+#: ../app/gegl/gimp-babl.c:235 ../app/gegl/gimp-babl.c:236
+#: ../app/gegl/gimp-babl.c:237 ../app/gegl/gimp-babl.c:238
 msgid "RGB"
 msgstr "RGB"
 
-#: ../app/gegl/gimp-babl.c:160 ../app/gegl/gimp-babl.c:161
-#: ../app/gegl/gimp-babl.c:162 ../app/gegl/gimp-babl.c:163
-#: ../app/gegl/gimp-babl.c:164
+#: ../app/gegl/gimp-babl.c:240 ../app/gegl/gimp-babl.c:241
+#: ../app/gegl/gimp-babl.c:242 ../app/gegl/gimp-babl.c:243
+#: ../app/gegl/gimp-babl.c:244 ../app/gegl/gimp-babl.c:245
+#: ../app/gegl/gimp-babl.c:246 ../app/gegl/gimp-babl.c:247
+#: ../app/gegl/gimp-babl.c:248 ../app/gegl/gimp-babl.c:249
 msgid "RGB-alpha"
 msgstr ""
 
-#: ../app/gegl/gimp-babl.c:166 ../app/gegl/gimp-babl.c:167
-#: ../app/gegl/gimp-babl.c:168 ../app/gegl/gimp-babl.c:169
-#: ../app/gegl/gimp-babl.c:170 ../app/gegl/gimp-babl.c:171
+#: ../app/gegl/gimp-babl.c:251 ../app/gegl/gimp-babl.c:252
+#: ../app/gegl/gimp-babl.c:253 ../app/gegl/gimp-babl.c:254
+#: ../app/gegl/gimp-babl.c:255 ../app/gegl/gimp-babl.c:256
+#: ../app/gegl/gimp-babl.c:257 ../app/gegl/gimp-babl.c:258
+#: ../app/gegl/gimp-babl.c:259 ../app/gegl/gimp-babl.c:260
 #, fuzzy
+#| msgctxt "image-convert-action"
+#| msgid "_Grayscale"
 msgid "Grayscale"
 msgstr "グレースケール(_G)"
 
-#: ../app/gegl/gimp-babl.c:173 ../app/gegl/gimp-babl.c:174
-#: ../app/gegl/gimp-babl.c:175 ../app/gegl/gimp-babl.c:176
-#: ../app/gegl/gimp-babl.c:177
+#: ../app/gegl/gimp-babl.c:262 ../app/gegl/gimp-babl.c:263
+#: ../app/gegl/gimp-babl.c:264 ../app/gegl/gimp-babl.c:265
+#: ../app/gegl/gimp-babl.c:266 ../app/gegl/gimp-babl.c:267
+#: ../app/gegl/gimp-babl.c:268 ../app/gegl/gimp-babl.c:269
+#: ../app/gegl/gimp-babl.c:270 ../app/gegl/gimp-babl.c:271
 #, fuzzy
+#| msgctxt "image-convert-action"
+#| msgid "_Grayscale"
 msgid "Grayscale-alpha"
 msgstr "グレースケール(_G)"
 
-#: ../app/gegl/gimp-babl.c:179 ../app/gegl/gimp-babl.c:180
-#: ../app/gegl/gimp-babl.c:181 ../app/gegl/gimp-babl.c:182
-#: ../app/gegl/gimp-babl.c:183
+#: ../app/gegl/gimp-babl.c:273 ../app/gegl/gimp-babl.c:274
+#: ../app/gegl/gimp-babl.c:275 ../app/gegl/gimp-babl.c:276
+#: ../app/gegl/gimp-babl.c:277 ../app/gegl/gimp-babl.c:278
+#: ../app/gegl/gimp-babl.c:279 ../app/gegl/gimp-babl.c:280
+#: ../app/gegl/gimp-babl.c:281 ../app/gegl/gimp-babl.c:282
 #, fuzzy
+#| msgctxt "image-action"
+#| msgid "C_omponents"
 msgid "Red component"
 msgstr "色要素(_O)"
 
-#: ../app/gegl/gimp-babl.c:185 ../app/gegl/gimp-babl.c:186
-#: ../app/gegl/gimp-babl.c:187 ../app/gegl/gimp-babl.c:188
-#: ../app/gegl/gimp-babl.c:189
+#: ../app/gegl/gimp-babl.c:284 ../app/gegl/gimp-babl.c:285
+#: ../app/gegl/gimp-babl.c:286 ../app/gegl/gimp-babl.c:287
+#: ../app/gegl/gimp-babl.c:288 ../app/gegl/gimp-babl.c:289
+#: ../app/gegl/gimp-babl.c:290 ../app/gegl/gimp-babl.c:291
+#: ../app/gegl/gimp-babl.c:292 ../app/gegl/gimp-babl.c:293
 #, fuzzy
+#| msgctxt "image-action"
+#| msgid "C_omponents"
 msgid "Green component"
 msgstr "色要素(_O)"
 
-#: ../app/gegl/gimp-babl.c:191 ../app/gegl/gimp-babl.c:192
-#: ../app/gegl/gimp-babl.c:193 ../app/gegl/gimp-babl.c:194
-#: ../app/gegl/gimp-babl.c:195
+#: ../app/gegl/gimp-babl.c:295 ../app/gegl/gimp-babl.c:296
+#: ../app/gegl/gimp-babl.c:297 ../app/gegl/gimp-babl.c:298
+#: ../app/gegl/gimp-babl.c:299 ../app/gegl/gimp-babl.c:300
+#: ../app/gegl/gimp-babl.c:301 ../app/gegl/gimp-babl.c:302
+#: ../app/gegl/gimp-babl.c:303 ../app/gegl/gimp-babl.c:304
 #, fuzzy
+#| msgctxt "image-action"
+#| msgid "C_omponents"
 msgid "Blue component"
 msgstr "色要素(_O)"
 
-#: ../app/gegl/gimp-babl.c:197 ../app/gegl/gimp-babl.c:198
-#: ../app/gegl/gimp-babl.c:199 ../app/gegl/gimp-babl.c:200
-#: ../app/gegl/gimp-babl.c:201 ../app/gegl/gimp-babl.c:202
+#: ../app/gegl/gimp-babl.c:306 ../app/gegl/gimp-babl.c:307
+#: ../app/gegl/gimp-babl.c:308 ../app/gegl/gimp-babl.c:309
+#: ../app/gegl/gimp-babl.c:310 ../app/gegl/gimp-babl.c:311
 #, fuzzy
+#| msgctxt "image-action"
+#| msgid "C_omponents"
 msgid "Alpha component"
 msgstr "色要素(_O)"
 
-#: ../app/gegl/gimp-babl.c:230
+#: ../app/gegl/gimp-babl.c:339
 #, fuzzy
+#| msgid "indexed-empty"
 msgid "Indexed-alpha"
 msgstr "インデックス-未描画"
 
-#: ../app/gegl/gimp-babl.c:232
+#: ../app/gegl/gimp-babl.c:341
 #, fuzzy
+#| msgid "indexed"
 msgid "Indexed"
 msgstr "インデックス"
 
-#: ../app/gegl/gimpcurvesconfig.c:449
-msgid "not a GIMP Curves file"
-msgstr "GIMP のトーンカーブ設定ファイルではありません"
-
-#: ../app/gegl/gimpcurvesconfig.c:464 ../app/gegl/gimplevelsconfig.c:786
-msgid "parse error"
-msgstr "解析エラー"
-
 #: ../app/gegl/gimp-gegl-enums.c:24
 msgctxt "cage-mode"
 msgid "Create or adjust the cage"
 msgstr "ケージを作成または調整"
 
 #: ../app/gegl/gimp-gegl-enums.c:25
+#, fuzzy
+#| msgctxt "cage-mode"
+#| msgid "Deform the cage to deform the image"
 msgctxt "cage-mode"
-msgid "Deform the cage to deform the image"
+msgid ""
+"Deform the cage\n"
+"to deform the image"
 msgstr "ケージを移動してオブジェクトを変形"
 
-#: ../app/gegl/gimplevelsconfig.c:739
+#: ../app/operations/gimpcurvesconfig.c:456
+msgid "not a GIMP Curves file"
+msgstr "GIMP のトーンカーブ設定ファイルではありません"
+
+#: ../app/operations/gimpcurvesconfig.c:471
+#: ../app/operations/gimplevelsconfig.c:808
+msgid "parse error"
+msgstr "解析エラー"
+
+#: ../app/operations/gimplevelsconfig.c:761
 msgid "not a GIMP Levels file"
 msgstr "GIMP の色レベル設定ファイルではありません。"
 
 # operation_class->description
-#: ../app/gegl/gimpoperationcagecoefcalc.c:68
+#: ../app/operations/gimpoperationcagecoefcalc.c:69
 msgid "Compute a set of coefficient buffer for the GIMP cage tool"
 msgstr "GIMP ケージ変形ツール用に係数バッファーを計算します"
 
 # operation_class->description
-#: ../app/gegl/gimpoperationcagetransform.c:106
+#: ../app/operations/gimpoperationcagetransform.c:106
 msgid ""
 "Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage "
 "tool"
 msgstr "ケージ変形ツール用に、係数バッファーを座標系バッファーに変換します"
 
-#: ../app/gegl/gimpoperationcagetransform.c:128
+#: ../app/operations/gimpoperationcagetransform.c:128
 msgid "Fill with plain color"
 msgstr "単色で塗りつぶす"
 
-#: ../app/gegl/gimpoperationcagetransform.c:129
-#: ../app/tools/gimpcageoptions.c:144
+#: ../app/operations/gimpoperationcagetransform.c:129
 msgid "Fill the original position of the cage with a plain color"
 msgstr "初期ケージ内を単色で塗りつぶす"
 
+#: ../app/operations/gimpoperationsemiflatten.c:84
+msgid "Replace partial transparency with a color"
+msgstr ""
+
+#: ../app/operations/gimpoperationthresholdalpha.c:80
+msgid ""
+"Make transparency all-or-nothing, by thresholding the alpha channel to a "
+"value"
+msgstr ""
+
 #. initialize the document history
-#: ../app/gui/gui.c:421
+#: ../app/gui/gui.c:423
 msgid "Documents"
 msgstr "ファイル"
 
@@ -11255,23 +12175,23 @@ msgstr "ファイル"
 msgid "GIMP Startup"
 msgstr "GIMP 起動中"
 
-#: ../app/paint/gimpairbrush.c:65 ../app/tools/gimpairbrushtool.c:55
+#: ../app/paint/gimpairbrush.c:66 ../app/tools/gimpairbrushtool.c:55
 msgid "Airbrush"
 msgstr "エアブラシで描画"
 
-#: ../app/paint/gimpbrushcore.c:385
+#: ../app/paint/gimpbrushcore.c:386
 msgid "No brushes available for use with this tool."
 msgstr "有効なブラシがありません。"
 
-#: ../app/paint/gimpbrushcore.c:392
+#: ../app/paint/gimpbrushcore.c:393
 msgid "No paint dynamics available for use with this tool."
 msgstr "このツールでは描画の動的特性を利用できません。"
 
-#: ../app/paint/gimpclone.c:83 ../app/tools/gimpclonetool.c:61
+#: ../app/paint/gimpclone.c:85 ../app/tools/gimpclonetool.c:56
 msgid "Clone"
 msgstr "スタンプで描画"
 
-#: ../app/paint/gimpclone.c:124
+#: ../app/paint/gimpclone.c:127
 msgid "No patterns available for use with this tool."
 msgstr "このツールではパターンは利用できません。"
 
@@ -11283,31 +12203,31 @@ msgstr "色混ぜ"
 msgid "Dodge/Burn"
 msgstr "暗室"
 
-#: ../app/paint/gimperaser.c:60 ../app/tools/gimperasertool.c:66
+#: ../app/paint/gimperaser.c:61 ../app/tools/gimperasertool.c:66
 msgid "Eraser"
 msgstr "消しゴム"
 
-#: ../app/paint/gimpheal.c:102 ../app/tools/gimphealtool.c:53
+#: ../app/paint/gimpheal.c:105 ../app/tools/gimphealtool.c:53
 msgid "Heal"
 msgstr "修復ブラシ"
 
-#: ../app/paint/gimpheal.c:141
+#: ../app/paint/gimpheal.c:144
 msgid "Healing does not operate on indexed layers."
 msgstr "インデックスレイヤーでは修復ブラシは使えません。"
 
-#: ../app/paint/gimpink.c:98 ../app/tools/gimpinktool.c:55
+#: ../app/paint/gimpink.c:99 ../app/tools/gimpinktool.c:55
 msgid "Ink"
 msgstr "インクで描画"
 
-#: ../app/paint/gimpinkoptions.c:72
+#: ../app/paint/gimpinkoptions.c:73
 msgid "Ink Blob Size"
 msgstr "大きさ"
 
-#: ../app/paint/gimpinkoptions.c:99
+#: ../app/paint/gimpinkoptions.c:100
 msgid "Ink Blob Aspect Ratio"
 msgstr "縦横比"
 
-#: ../app/paint/gimpinkoptions.c:103
+#: ../app/paint/gimpinkoptions.c:104
 msgid "Ink Blob Angle"
 msgstr "角度"
 
@@ -11315,70 +12235,70 @@ msgstr "角度"
 msgid "Paintbrush"
 msgstr "ブラシで描画"
 
-#: ../app/paint/gimppaintcore.c:135
+#: ../app/paint/gimppaintcore.c:139
 msgid "Paint"
 msgstr "描画"
 
-#: ../app/paint/gimppaintoptions.c:145
+#: ../app/paint/gimppaintoptions.c:155
 msgid "Brush Size"
 msgstr "ブラシサイズを指定します"
 
-#: ../app/paint/gimppaintoptions.c:159
+#: ../app/paint/gimppaintoptions.c:169
 msgid "Every stamp has its own opacity"
 msgstr ""
 "この設定がオンのときは、ストローク中の各ブラシマークが独自の不透明度を持ち、"
 "同一ストローク内でブラシマーク同士が重ね塗りされます"
 
-#: ../app/paint/gimppaintoptions.c:165
+#: ../app/paint/gimppaintoptions.c:175
 msgid "Ignore fuzziness of the current brush"
 msgstr "ブラシのぼかし度合いを無視して描画します"
 
-#: ../app/paint/gimppaintoptions.c:170
+#: ../app/paint/gimppaintoptions.c:180
 msgid "Scatter brush as you paint"
 msgstr "ストローク中のブラシマークを散乱させます"
 
-#: ../app/paint/gimppaintoptions.c:174
+#: ../app/paint/gimppaintoptions.c:184
 msgid "Distance of scattering"
 msgstr "散布される距離 (範囲) を設定します"
 
-#: ../app/paint/gimppaintoptions.c:184
+#: ../app/paint/gimppaintoptions.c:194
 msgid "Distance over which strokes fade out"
 msgstr "フェードアウトまでの長さを設定します"
 
-#: ../app/paint/gimppaintoptions.c:192
+#: ../app/paint/gimppaintoptions.c:202
 msgid "Reverse direction of fading"
 msgstr "フェードの方向を反転します"
 
-#: ../app/paint/gimppaintoptions.c:196
+#: ../app/paint/gimppaintoptions.c:206
 msgid "How fade is repeated as you paint"
 msgstr "フェードの反復スタイルを指定します"
 
-#: ../app/paint/gimppaintoptions.c:255
+#: ../app/paint/gimppaintoptions.c:265
 msgid "Paint smoother strokes"
 msgstr "フリーハンドで描画する際の手ブレを補正します"
 
-#: ../app/paint/gimppaintoptions.c:259
+#: ../app/paint/gimppaintoptions.c:269
 msgid "Depth of smoothing"
 msgstr "補正の深度 (サンプル数) を指定します"
 
-#: ../app/paint/gimppaintoptions.c:263
+#: ../app/paint/gimppaintoptions.c:273
 msgid "Gravity of the pen"
 msgstr "補正の適用割合を指定します"
 
-#: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:51
+#: ../app/paint/gimppencil.c:42 ../app/tools/gimppenciltool.c:51
 msgid "Pencil"
 msgstr "鉛筆で描画"
 
-#: ../app/paint/gimpperspectiveclone.c:87
+#: ../app/paint/gimpperspectiveclone.c:90
 #: ../app/tools/gimpperspectiveclonetool.c:133
 msgid "Perspective Clone"
 msgstr "遠近スタンプで描画"
 
-#: ../app/paint/gimpsmudge.c:81 ../app/tools/gimpsmudgetool.c:54
+#: ../app/paint/gimpsmudge.c:82 ../app/tools/gimpsmudgetool.c:54
 msgid "Smudge"
 msgstr "にじみ"
 
-#: ../app/paint/gimpsourcecore.c:232
+#: ../app/paint/gimpsourcecore.c:237
 msgid "Set a source image first."
 msgstr "最初にスタンプソースを設定してください"
 
@@ -11447,80 +12367,81 @@ msgstr "菱形"
 msgid "Combine Masks"
 msgstr "マスクの適用"
 
-#: ../app/pdb/color-cmds.c:83
+#: ../app/pdb/color-cmds.c:89
 msgctxt "undo-type"
 msgid "Brightness-Contrast"
 msgstr "明るさ-コントラスト"
 
-#: ../app/pdb/color-cmds.c:142
+#: ../app/pdb/color-cmds.c:149
 #, fuzzy
+#| msgid "Levels"
 msgctxt "undo-type"
 msgid "Levels"
 msgstr "レベル"
 
-#: ../app/pdb/color-cmds.c:236 ../app/tools/gimpposterizetool.c:78
+#: ../app/pdb/color-cmds.c:246 ../app/tools/gimpposterizetool.c:59
 msgid "Posterize"
 msgstr "ポスタリゼーション"
 
-#: ../app/pdb/color-cmds.c:273 ../app/pdb/color-cmds.c:312
-#: ../app/tools/gimpdesaturatetool.c:74
+#: ../app/pdb/color-cmds.c:284 ../app/pdb/color-cmds.c:324
+#: ../app/tools/gimpdesaturatetool.c:67
 msgid "Desaturate"
 msgstr "脱色"
 
-#: ../app/pdb/color-cmds.c:418 ../app/pdb/color-cmds.c:464
+#: ../app/pdb/color-cmds.c:433 ../app/pdb/color-cmds.c:480
 msgctxt "undo-type"
 msgid "Curves"
 msgstr "トーンカーブ"
 
-#: ../app/pdb/color-cmds.c:517
+#: ../app/pdb/color-cmds.c:534
 msgctxt "undo-type"
 msgid "Color Balance"
 msgstr "カラーバランス"
 
-#: ../app/pdb/color-cmds.c:562
+#: ../app/pdb/color-cmds.c:580
 msgctxt "undo-type"
 msgid "Colorize"
 msgstr "着色"
 
-#: ../app/pdb/color-cmds.c:685 ../app/tools/gimphuesaturationtool.c:97
+#: ../app/pdb/color-cmds.c:723 ../app/tools/gimphuesaturationtool.c:91
 msgid "Hue-Saturation"
 msgstr "色相-彩度"
 
 # 「閾(しきい)」の漢字が読めない、またはディスプレイ上で識別できない人がいる可能性があるので、「しきい値」とした
-#: ../app/pdb/color-cmds.c:726 ../app/tools/gimpblendoptions.c:276
-#: ../app/tools/gimpbucketfilloptions.c:286
-#: ../app/tools/gimpregionselectoptions.c:217
-#: ../app/tools/gimpthresholdtool.c:87
+#: ../app/pdb/color-cmds.c:765 ../app/tools/gimpblendoptions.c:269
+#: ../app/tools/gimpbucketfilloptions.c:285
+#: ../app/tools/gimpregionselectoptions.c:215
+#: ../app/tools/gimpthresholdtool.c:88
 msgid "Threshold"
 msgstr "しきい値"
 
-#: ../app/pdb/drawable-cmds.c:520
+#: ../app/pdb/drawable-cmds.c:521
 msgid "Plug-In"
 msgstr "プラグイン"
 
-#: ../app/pdb/drawable-transform-cmds.c:349
-#: ../app/pdb/drawable-transform-cmds.c:447
-#: ../app/pdb/item-transform-cmds.c:266 ../app/pdb/transform-tools-cmds.c:167
-#: ../app/tools/gimpperspectivetool.c:82
+#: ../app/pdb/drawable-transform-cmds.c:355
+#: ../app/pdb/drawable-transform-cmds.c:455
+#: ../app/pdb/item-transform-cmds.c:270 ../app/pdb/transform-tools-cmds.c:171
+#: ../app/tools/gimpperspectivetool.c:83
 msgid "Perspective"
 msgstr "遠近法"
 
-#: ../app/pdb/drawable-transform-cmds.c:961
-#: ../app/pdb/drawable-transform-cmds.c:1046
-#: ../app/pdb/item-transform-cmds.c:615 ../app/pdb/transform-tools-cmds.c:422
-#: ../app/tools/gimpsheartool.c:113
+#: ../app/pdb/drawable-transform-cmds.c:977
+#: ../app/pdb/drawable-transform-cmds.c:1064
+#: ../app/pdb/item-transform-cmds.c:621 ../app/pdb/transform-tools-cmds.c:432
+#: ../app/tools/gimpsheartool.c:115
 msgid "Shearing"
 msgstr "剪断変形しています..."
 
-#: ../app/pdb/drawable-transform-cmds.c:1142
-#: ../app/pdb/item-transform-cmds.c:713 ../app/pdb/transform-tools-cmds.c:511
+#: ../app/pdb/drawable-transform-cmds.c:1161
+#: ../app/pdb/item-transform-cmds.c:719 ../app/pdb/transform-tools-cmds.c:523
 msgid "2D Transform"
 msgstr "2D 変換"
 
-#: ../app/pdb/drawable-transform-cmds.c:1238
-#: ../app/pdb/drawable-transform-cmds.c:1342
-#: ../app/pdb/drawable-transform-cmds.c:1446
-#: ../app/pdb/item-transform-cmds.c:819
+#: ../app/pdb/drawable-transform-cmds.c:1259
+#: ../app/pdb/drawable-transform-cmds.c:1364
+#: ../app/pdb/drawable-transform-cmds.c:1470
+#: ../app/pdb/item-transform-cmds.c:825
 msgid "2D Transforming"
 msgstr "2D 変換しています..."
 
@@ -11540,13 +12461,13 @@ msgstr ""
 "このレイヤーを通常のレイヤーに変換できません。(フローティング選択範囲ではあり"
 "ません。)"
 
-#: ../app/pdb/gimppdb.c:305 ../app/pdb/gimppdb.c:376
+#: ../app/pdb/gimppdb.c:306 ../app/pdb/gimppdb.c:377
 #: ../app/pdb/gimppdb-query.c:299
 #, c-format
 msgid "Procedure '%s' not found"
 msgstr "プロシージャー '%s' が見つかりません。"
 
-#: ../app/pdb/gimppdb.c:411
+#: ../app/pdb/gimppdb.c:412
 #, c-format
 msgid ""
 "Procedure '%s' has been called with a wrong type for argument #%d. Expected "
@@ -11555,121 +12476,119 @@ msgstr ""
 "プロシージャー '%s' は、%d 番目の引数に誤ったデータ型 (%s でなければいけない"
 "ところに %s) を用いて呼び出されました。"
 
-#: ../app/pdb/gimppdbcontext.c:89
-#: ../app/tools/gimpforegroundselectoptions.c:80
-#: ../app/tools/gimpselectionoptions.c:79
+#: ../app/pdb/gimppdbcontext.c:89 ../app/tools/gimpselectionoptions.c:79
 msgid "Smooth edges"
 msgstr "境界をなめらかにします"
 
-#: ../app/pdb/gimppdb-utils.c:73
+#: ../app/pdb/gimppdb-utils.c:74
 msgid "Invalid empty brush name"
 msgstr "ブラシ名が無く無効です。"
 
-#: ../app/pdb/gimppdb-utils.c:82
+#: ../app/pdb/gimppdb-utils.c:83
 #, c-format
 msgid "Brush '%s' not found"
 msgstr "ブラシ '%s' が見つかりません。"
 
-#: ../app/pdb/gimppdb-utils.c:87
+#: ../app/pdb/gimppdb-utils.c:88
 #, c-format
 msgid "Brush '%s' is not editable"
 msgstr "'%s' は編集可能なブラシではありません。"
 
-#: ../app/pdb/gimppdb-utils.c:113
+#: ../app/pdb/gimppdb-utils.c:114
 #, c-format
 msgid "Brush '%s' is not a generated brush"
 msgstr "'%s' は生成されたブラシではありません。"
 
-#: ../app/pdb/gimppdb-utils.c:134
+#: ../app/pdb/gimppdb-utils.c:135
 msgid "Invalid empty paint dynamics name"
 msgstr "描画の動的特性の名前が無く無効です"
 
-#: ../app/pdb/gimppdb-utils.c:143
+#: ../app/pdb/gimppdb-utils.c:144
 #, c-format
 msgid "Paint dynamics '%s' not found"
 msgstr "描画の動的特性 '%s' が見つかりません"
 
-#: ../app/pdb/gimppdb-utils.c:148
+#: ../app/pdb/gimppdb-utils.c:149
 #, c-format
 msgid "Paint dynamics '%s' is not editable"
 msgstr "描画の動的特性 '%s' は設定変更できません。"
 
-#: ../app/pdb/gimppdb-utils.c:168
+#: ../app/pdb/gimppdb-utils.c:169
 msgid "Invalid empty pattern name"
 msgstr "パターン名が無く無効です。"
 
-#: ../app/pdb/gimppdb-utils.c:177
+#: ../app/pdb/gimppdb-utils.c:178
 #, c-format
 msgid "Pattern '%s' not found"
 msgstr "パターン '%s' が見つかりません"
 
-#: ../app/pdb/gimppdb-utils.c:197
+#: ../app/pdb/gimppdb-utils.c:198
 msgid "Invalid empty gradient name"
 msgstr "グラデーション名が無く無効です。"
 
-#: ../app/pdb/gimppdb-utils.c:206
+#: ../app/pdb/gimppdb-utils.c:207
 #, c-format
 msgid "Gradient '%s' not found"
 msgstr "グラデーション '%s' が見つかりません"
 
-#: ../app/pdb/gimppdb-utils.c:211
+#: ../app/pdb/gimppdb-utils.c:212
 #, c-format
 msgid "Gradient '%s' is not editable"
 msgstr "'%s' は編集可能なグラデーションではありません。"
 
-#: ../app/pdb/gimppdb-utils.c:232
+#: ../app/pdb/gimppdb-utils.c:233
 msgid "Invalid empty palette name"
 msgstr "パレット名が無く無効です。"
 
-#: ../app/pdb/gimppdb-utils.c:241
+#: ../app/pdb/gimppdb-utils.c:242
 #, c-format
 msgid "Palette '%s' not found"
 msgstr "パレット '%s' が見つかりません"
 
-#: ../app/pdb/gimppdb-utils.c:246
+#: ../app/pdb/gimppdb-utils.c:247
 #, c-format
 msgid "Palette '%s' is not editable"
 msgstr "'%s' は編集可能なパレットではありません。"
 
-#: ../app/pdb/gimppdb-utils.c:266
+#: ../app/pdb/gimppdb-utils.c:267
 msgid "Invalid empty font name"
 msgstr "フォント名が無く無効です。"
 
-#: ../app/pdb/gimppdb-utils.c:276
+#: ../app/pdb/gimppdb-utils.c:277
 #, c-format
 msgid "Font '%s' not found"
 msgstr "フォント '%s' が見つかりません"
 
-#: ../app/pdb/gimppdb-utils.c:295
+#: ../app/pdb/gimppdb-utils.c:296
 msgid "Invalid empty buffer name"
 msgstr "(名前付きバッファーの) バッファー名が無く無効です。"
 
-#: ../app/pdb/gimppdb-utils.c:305
+#: ../app/pdb/gimppdb-utils.c:306
 #, c-format
 msgid "Named buffer '%s' not found"
 msgstr "名前付きバッファー '%s' が見つかりません。"
 
-#: ../app/pdb/gimppdb-utils.c:324
+#: ../app/pdb/gimppdb-utils.c:325
 msgid "Invalid empty paint method name"
 msgstr "(名前付き描画メソッドの) メソッド名が無く無効です。"
 
-#: ../app/pdb/gimppdb-utils.c:334
+#: ../app/pdb/gimppdb-utils.c:335
 #, c-format
 msgid "Paint method '%s' does not exist"
 msgstr "描画メソッド '%s' は存在しません。"
 
-#: ../app/pdb/gimppdb-utils.c:353
+#: ../app/pdb/gimppdb-utils.c:354
 #, c-format
 msgid "Item '%s' (%d) cannot be used because it has not been added to an image"
 msgstr ""
 "アイテム '%s' (ID: %d) は、画像に加えられていなかったので使用されません。"
 
-#: ../app/pdb/gimppdb-utils.c:363
+#: ../app/pdb/gimppdb-utils.c:364
 #, c-format
 msgid "Item '%s' (%d) cannot be used because it is attached to another image"
 msgstr "アイテム '%s' (ID: %d) は、他の画像に付属しているので使用されません。"
 
-#: ../app/pdb/gimppdb-utils.c:392
+#: ../app/pdb/gimppdb-utils.c:390
 #, c-format
 msgid ""
 "Item '%s' (%d) cannot be used because it is not a direct child of an item "
@@ -11677,7 +12596,7 @@ msgid ""
 msgstr ""
 "アイテム '%s' (ID: %d) は、アイテムツリーの直接の子アイテムではありません。"
 
-#: ../app/pdb/gimppdb-utils.c:420
+#: ../app/pdb/gimppdb-utils.c:418
 #, c-format
 msgid ""
 "Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of "
@@ -11686,58 +12605,69 @@ msgstr ""
 "アイテム '%s' (ID: %d) とアイテム '%s' (ID: %d) は同じアイテムツリーに属して"
 "いないので使用されません。"
 
-#: ../app/pdb/gimppdb-utils.c:445
+#: ../app/pdb/gimppdb-utils.c:443
 #, c-format
 msgid "Item '%s' (%d) must not be an ancestor of '%s' (%d)"
 msgstr ""
 "アイテム '%s' (ID: %d) は、アイテム '%s' (ID: %d) の原型ではありません。"
 
-#: ../app/pdb/gimppdb-utils.c:469
+#: ../app/pdb/gimppdb-utils.c:467
 #, c-format
 msgid "Item '%s' (%d) has already been added to an image"
 msgstr "アイテム '%s' (ID: %d) は既に画像に加えられています。"
 
-#: ../app/pdb/gimppdb-utils.c:477
+#: ../app/pdb/gimppdb-utils.c:475
 #, c-format
 msgid "Trying to add item '%s' (%d) to wrong image"
 msgstr "アイテム '%s' (ID: %d) を誤った画像に加えようとしています。"
 
-#: ../app/pdb/gimppdb-utils.c:496
+#: ../app/pdb/gimppdb-utils.c:495
 #, c-format
 msgid "Item '%s' (%d) cannot be modified because its contents are locked"
 msgstr ""
 "アイテム '%s' (ID: %d) は保護されているので、変更することができません。"
 
-#: ../app/pdb/gimppdb-utils.c:516
+#: ../app/pdb/gimppdb-utils.c:505
+#, fuzzy, c-format
+#| msgid "Item '%s' (%d) cannot be modified because its contents are locked"
+msgid ""
+"Item '%s' (%d) cannot be modified because its position and size are locked"
+msgstr ""
+"アイテム '%s' (ID: %d) は保護されているので、変更することができません。"
+
+#: ../app/pdb/gimppdb-utils.c:525
 #, c-format
 msgid "Item '%s' (%d) cannot be used because it is not a group item"
 msgstr "アイテム '%s' (ID: %d) はグループアイテムなので使用されません。"
 
-#: ../app/pdb/gimppdb-utils.c:536
+#: ../app/pdb/gimppdb-utils.c:545
 #, c-format
 msgid "Item '%s' (%d) cannot be modified because it is a group item"
 msgstr "アイテム '%s' (ID: %d) はグループアイテムなので変更できません。"
 
-#: ../app/pdb/gimppdb-utils.c:557
+#: ../app/pdb/gimppdb-utils.c:566
 #, c-format
 msgid "Layer '%s' (%d) cannot be used because it is not a text layer"
 msgstr ""
 "レイヤー '%s' (ID: %d) は、テキストレイヤーではないので使用されません。"
 
-#: ../app/pdb/gimppdb-utils.c:598
+#: ../app/pdb/gimppdb-utils.c:607
 #, c-format
 msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected"
 msgstr ""
 "要求される画像は '%4$s' 形式のものですが、画像 '%1$s' (ID: %2$d) は '%3$s' 形"
 "式です。"
 
-#: ../app/pdb/gimppdb-utils.c:621
+#: ../app/pdb/gimppdb-utils.c:630
 #, fuzzy, c-format
+#| msgid "Image '%s' (%d) is already of type '%s'"
 msgid "Image '%s' (%d) must not be of type '%s'"
 msgstr "画像 '%s' (ID: %d) は、既に '%s' 形式です。"
 
-#: ../app/pdb/gimppdb-utils.c:641
+#: ../app/pdb/gimppdb-utils.c:650
 #, fuzzy, c-format
+#| msgid ""
+#| "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected"
 msgid ""
 "Image '%s' (%d) has precision '%s', but an image of precision '%s' is "
 "expected"
@@ -11745,22 +12675,23 @@ msgstr ""
 "要求される画像は '%4$s' 形式のものですが、画像 '%1$s' (ID: %2$d) は '%3$s' 形"
 "式です。"
 
-#: ../app/pdb/gimppdb-utils.c:664
+#: ../app/pdb/gimppdb-utils.c:673
 #, fuzzy, c-format
+#| msgid "Image '%s' (%d) is already of type '%s'"
 msgid "Image '%s' (%d) must not be of precision '%s'"
 msgstr "画像 '%s' (ID: %d) は、既に '%s' 形式です。"
 
-#: ../app/pdb/gimppdb-utils.c:692
+#: ../app/pdb/gimppdb-utils.c:702
 #, c-format
 msgid "Vectors object %d does not contain stroke with ID %d"
 msgstr "ベクターオブジェクト %d は ID %d によるストロークを含みません"
 
-#: ../app/pdb/gimpprocedure.c:375 ../app/plug-in/gimppluginprocframe.c:212
+#: ../app/pdb/gimpprocedure.c:376 ../app/plug-in/gimppluginprocframe.c:213
 #, c-format
 msgid "Procedure '%s' returned no return values"
 msgstr "プロシージャー '%s' には戻り値がありませんでした。"
 
-#: ../app/pdb/gimpprocedure.c:645
+#: ../app/pdb/gimpprocedure.c:646
 #, c-format
 msgid ""
 "Procedure '%s' returned a wrong value type for return value '%s' (#%d). "
@@ -11769,7 +12700,7 @@ msgstr ""
 "プロシージャー '%s' の戻り値 '%s'(%d 番目)はデータ型を誤っています 。(%s のは"
 "ずが %s で戻っています。)"
 
-#: ../app/pdb/gimpprocedure.c:657
+#: ../app/pdb/gimpprocedure.c:658
 #, c-format
 msgid ""
 "Procedure '%s' has been called with a wrong value type for argument '%s' (#"
@@ -11778,7 +12709,7 @@ msgstr ""
 "プロシージャー '%s' 呼び出し時の引数 '%s'(%d 番目の引数) は、データ型を誤って"
 "います。(%s のはずが %s でした。)"
 
-#: ../app/pdb/gimpprocedure.c:690
+#: ../app/pdb/gimpprocedure.c:691
 #, c-format
 msgid ""
 "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
@@ -11787,7 +12718,7 @@ msgstr ""
 "プロシージャー '%s' は、引数 '%s' に対して無効な ID を返しました。すでに存在"
 "していないレイヤーに対してプラグインが処理を進めようとしているようです。"
 
-#: ../app/pdb/gimpprocedure.c:703
+#: ../app/pdb/gimpprocedure.c:704
 #, c-format
 msgid ""
 "Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
@@ -11796,7 +12727,7 @@ msgstr ""
 "プロシージャー '%s' 呼び出し時の引数 '%s' の値は、無効な ID です。プラグイン"
 "は、すでに存在しないレイヤーに対して処理を進めようとしているようです。"
 
-#: ../app/pdb/gimpprocedure.c:720
+#: ../app/pdb/gimpprocedure.c:721
 #, c-format
 msgid ""
 "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
@@ -11805,7 +12736,7 @@ msgstr ""
 "プロシージャー '%s' は、引数 '%s' に対して無効な ID を返しました。プラグイン"
 "は、すでに存在しない画像に対して処理を進めようとしているようです。"
 
-#: ../app/pdb/gimpprocedure.c:733
+#: ../app/pdb/gimpprocedure.c:734
 #, c-format
 msgid ""
 "Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
@@ -11814,7 +12745,7 @@ msgstr ""
 "プロシージャー '%s' 呼び出し時の引数 '%s' の値は、無効な ID です。プラグイン"
 "は、すでに存在しない画像に対して処理を進めようとしているようです。"
 
-#: ../app/pdb/gimpprocedure.c:754
+#: ../app/pdb/gimpprocedure.c:755
 #, c-format
 msgid ""
 "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value "
@@ -11823,7 +12754,7 @@ msgstr ""
 "プロシージャー '%1$s' は戻り値 '%3$s' (%4$d 番目、%5$s 型)として値 '%2$s' を"
 "返しましたが、この値は適正値の範囲外です。"
 
-#: ../app/pdb/gimpprocedure.c:768
+#: ../app/pdb/gimpprocedure.c:769
 #, c-format
 msgid ""
 "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type "
@@ -11832,7 +12763,7 @@ msgstr ""
 "プロシージャー %1$s 呼び出し時の引数 '%3$s' (%4$d 番目の引数、%5$s 型) の値 "
 "'%2$s' は、適正値の範囲外です。"
 
-#: ../app/pdb/image-cmds.c:2445
+#: ../app/pdb/image-cmds.c:2517
 msgid ""
 "Image resolution is out of bounds, using the default resolution instead."
 msgstr "画像の解像度が制限を越えているため、標準解像度を代わりに使用します。"
@@ -11842,45 +12773,187 @@ msgstr "画像の解像度が制限を越えているため、標準解像度を
 msgid "Free Select"
 msgstr "自由選択"
 
-#: ../app/pdb/layer-cmds.c:488 ../app/pdb/layer-cmds.c:526
+#: ../app/pdb/layer-cmds.c:540 ../app/pdb/layer-cmds.c:584
 msgid "Move Layer"
 msgstr "レイヤーを移動"
 
-#: ../app/pdb/plug-in-compat-cmds.c:80
+#: ../app/pdb/plug-in-compat-cmds.c:110
+msgctxt "undo-type"
+msgid "Alien Map"
+msgstr ""
+
+#: ../app/pdb/plug-in-compat-cmds.c:148
+#, fuzzy
+#| msgid "Antialiasing"
+msgctxt "undo-type"
+msgid "Antialias"
+msgstr "なめらかに"
+
+#: ../app/pdb/plug-in-compat-cmds.c:197
+#, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Crop image"
+msgid "Autocrop image"
+msgstr "画像の切り抜き"
+
+#: ../app/pdb/plug-in-compat-cmds.c:244
+#, fuzzy
+#| msgid "Drop layers"
+msgid "Autocrop layer"
+msgstr "レイヤーをドロップ"
+
+#: ../app/pdb/plug-in-compat-cmds.c:286
+#, fuzzy
+#| msgid "Con_trast:"
+msgctxt "undo-type"
+msgid "Stretch Contrast"
+msgstr "コントラスト(_T):"
+
+#: ../app/pdb/plug-in-compat-cmds.c:354
+#, fuzzy
+#| msgctxt "channels-action"
+#| msgid "Channels Menu"
+msgctxt "undo-type"
+msgid "Channel Mixer"
+msgstr "チャンネルのメニュー"
+
+#: ../app/pdb/plug-in-compat-cmds.c:399
 #, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Add Color to Colormap"
 msgctxt "undo-type"
 msgid "Color to Alpha"
 msgstr "カラーマップに色を追加"
 
-#: ../app/pdb/plug-in-compat-cmds.c:121 ../app/pdb/plug-in-compat-cmds.c:164
+#: ../app/pdb/plug-in-compat-cmds.c:462
+msgctxt "undo-type"
+msgid "Cubism"
+msgstr ""
+
+#: ../app/pdb/plug-in-compat-cmds.c:516
+#, fuzzy
+#| msgctxt "plug-in-action"
+#| msgid "_Noise"
+msgctxt "undo-type"
+msgid "Noise HSV"
+msgstr "ノイズ(_N)"
+
+#: ../app/pdb/plug-in-compat-cmds.c:554
+#, fuzzy
+#| msgctxt "layer-mode-effects"
+#| msgid "Replace"
+msgctxt "undo-type"
+msgid "Laplace"
+msgstr "置換"
+
+#: ../app/pdb/plug-in-compat-cmds.c:626
+msgctxt "undo-type"
+msgid "Lens Distortion"
+msgstr ""
+
+#: ../app/pdb/plug-in-compat-cmds.c:665
+#, fuzzy
+#| msgid "File Name:"
+msgctxt "undo-type"
+msgid "Tile Seamless"
+msgstr "ファイル名:"
+
+#: ../app/pdb/plug-in-compat-cmds.c:740 ../app/pdb/plug-in-compat-cmds.c:819
+#, fuzzy
+#| msgid "Motion only"
+msgctxt "undo-type"
+msgid "Motion Blur"
+msgstr "ブラシ移動時のみ以下を適用"
+
+#: ../app/pdb/plug-in-compat-cmds.c:921
+msgctxt "undo-type"
+msgid "Mosaic"
+msgstr ""
+
+#: ../app/pdb/plug-in-compat-cmds.c:962 ../app/pdb/plug-in-compat-cmds.c:1006
 #, fuzzy
+#| msgctxt "color-frame-mode"
+#| msgid "Pixel"
 msgctxt "undo-type"
 msgid "Pixelize"
 msgstr "ピクセル値"
 
-#: ../app/pdb/plug-in-compat-cmds.c:216
+#: ../app/pdb/plug-in-compat-cmds.c:1058
+msgctxt "undo-type"
+msgid "Plasma"
+msgstr ""
+
+#: ../app/pdb/plug-in-compat-cmds.c:1111
 msgctxt "undo-type"
 msgid "Polar Coordinates"
 msgstr ""
 
-#: ../app/pdb/plug-in-compat-cmds.c:260
+#: ../app/pdb/plug-in-compat-cmds.c:1152
+msgctxt "undo-type"
+msgid "Red Eye Removal"
+msgstr ""
+
+#: ../app/pdb/plug-in-compat-cmds.c:1206
+#, fuzzy
+#| msgid "Random"
+msgctxt "undo-type"
+msgid "Random Hurl"
+msgstr "不規則"
+
+#: ../app/pdb/plug-in-compat-cmds.c:1260
+#, fuzzy
+#| msgid "Random"
+msgctxt "undo-type"
+msgid "Random Pick"
+msgstr "不規則"
+
+#: ../app/pdb/plug-in-compat-cmds.c:1314
+#, fuzzy
+#| msgid "Random"
+msgctxt "undo-type"
+msgid "Random Slur"
+msgstr "不規則"
+
+#: ../app/pdb/plug-in-compat-cmds.c:1359
 msgctxt "undo-type"
 msgid "Semi-Flatten"
 msgstr ""
 
+#: ../app/pdb/plug-in-compat-cmds.c:1403
+msgctxt "undo-type"
+msgid "Shift"
+msgstr ""
+
+#: ../app/pdb/plug-in-compat-cmds.c:1448
+msgctxt "undo-type"
+msgid "Spread"
+msgstr ""
+
 # 「閾(しきい)」の漢字が読めない、またはディスプレイ上で識別できない人がいる可能性があるので、「しきい値」とした
-#: ../app/pdb/plug-in-compat-cmds.c:301
+#: ../app/pdb/plug-in-compat-cmds.c:1490
 #, fuzzy
+#| msgid "Threshold"
 msgctxt "undo-type"
 msgid "Threshold Alpha"
 msgstr "しきい値"
 
-#: ../app/pdb/plug-in-compat-cmds.c:338
+#: ../app/pdb/plug-in-compat-cmds.c:1528
 #, fuzzy
+#| msgid "Invert"
 msgctxt "undo-type"
 msgid "Value Invert"
 msgstr "反転"
 
+#: ../app/pdb/plug-in-compat-cmds.c:1592
+msgctxt "undo-type"
+msgid "Waves"
+msgstr ""
+
+#: ../app/pdb/plug-in-compat-cmds.c:1639
+msgctxt "undo-type"
+msgid "Whirl and Pinch"
+msgstr ""
+
 #: ../app/pdb/text-layer-cmds.c:95
 #, c-format
 msgid "Failed to create text layer"
@@ -11897,37 +12970,37 @@ msgstr "テキストレイヤーの作成に失敗しました。"
 msgid "Set text layer attribute"
 msgstr "テキストレイヤーのプロパティ設定"
 
-#: ../app/pdb/vectors-cmds.c:327
+#: ../app/pdb/vectors-cmds.c:328
 msgid "Remove path stroke"
 msgstr "パスストロークの削除"
 
-#: ../app/pdb/vectors-cmds.c:363
+#: ../app/pdb/vectors-cmds.c:365
 msgid "Close path stroke"
 msgstr "パスストロークを閉じる"
 
-#: ../app/pdb/vectors-cmds.c:403
+#: ../app/pdb/vectors-cmds.c:410
 msgid "Translate path stroke"
 msgstr "パスストロークの剪段変形"
 
-#: ../app/pdb/vectors-cmds.c:443
+#: ../app/pdb/vectors-cmds.c:455
 msgid "Scale path stroke"
 msgstr "パスストロークの拡大・縮小"
 
-#: ../app/pdb/vectors-cmds.c:485
+#: ../app/pdb/vectors-cmds.c:502
 msgid "Rotate path stroke"
 msgstr "パスストロークの回転"
 
-#: ../app/pdb/vectors-cmds.c:525 ../app/pdb/vectors-cmds.c:569
+#: ../app/pdb/vectors-cmds.c:547 ../app/pdb/vectors-cmds.c:596
 msgid "Flip path stroke"
 msgstr "パスストロークの反転"
 
-#: ../app/pdb/vectors-cmds.c:698 ../app/pdb/vectors-cmds.c:821
-#: ../app/pdb/vectors-cmds.c:1041
+#: ../app/pdb/vectors-cmds.c:727 ../app/pdb/vectors-cmds.c:851
+#: ../app/pdb/vectors-cmds.c:1081
 msgid "Add path stroke"
 msgstr "パスストロークの追加"
 
-#: ../app/pdb/vectors-cmds.c:874 ../app/pdb/vectors-cmds.c:927
-#: ../app/pdb/vectors-cmds.c:988
+#: ../app/pdb/vectors-cmds.c:905 ../app/pdb/vectors-cmds.c:961
+#: ../app/pdb/vectors-cmds.c:1025
 msgid "Extend path stroke"
 msgstr "パスストロークの拡張"
 
@@ -11965,45 +13038,45 @@ msgstr ""
 "\"%s\" プラグインがクラッシュしました。\n"
 "(%s)\n"
 "\n"
-"クラッシュしたプラグインは GIMP の内部状態を不安定にするかもしれません。作業"
-"中の画像を一旦保存して GIMP を再起動した方が良いでしょう。"
+"プラグインのクラッシュによって GIMP の内部状態が不安定になった可能性がありま"
+"す。作業中の画像を一旦保存して GIMP を再起動した方が良いでしょう。"
 
-#: ../app/plug-in/gimppluginmanager.c:296
+#: ../app/plug-in/gimppluginmanager.c:297
 msgid "Plug-In Interpreters"
 msgstr "プラグイン インタープリター"
 
-#: ../app/plug-in/gimppluginmanager.c:303
+#: ../app/plug-in/gimppluginmanager.c:304
 msgid "Plug-In Environment"
 msgstr "プラグインの環境"
 
-#: ../app/plug-in/gimppluginmanager-call.c:171
-#: ../app/plug-in/gimppluginmanager-call.c:221
-#: ../app/plug-in/gimppluginmanager-call.c:319
+#: ../app/plug-in/gimppluginmanager-call.c:170
+#: ../app/plug-in/gimppluginmanager-call.c:220
+#: ../app/plug-in/gimppluginmanager-call.c:318
 #, c-format
 msgid "Failed to run plug-in \"%s\""
 msgstr "'%s' プラグインの実行に失敗しました"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:229
+#: ../app/plug-in/gimppluginmanager-restore.c:230
 msgid "Searching Plug-Ins"
 msgstr "プラグインを検索しています"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:284
+#: ../app/plug-in/gimppluginmanager-restore.c:285
 msgid "Resource configuration"
 msgstr "リソース設定"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:320
+#: ../app/plug-in/gimppluginmanager-restore.c:321
 msgid "Querying new Plug-ins"
 msgstr "新規プラグイン問い合わせ中"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:370
+#: ../app/plug-in/gimppluginmanager-restore.c:371
 msgid "Initializing Plug-ins"
 msgstr "プラグイン初期化中"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:442
+#: ../app/plug-in/gimppluginmanager-restore.c:443
 msgid "Starting Extensions"
 msgstr "拡張機能起動中"
 
-#: ../app/plug-in/gimpplugin-message.c:485
+#: ../app/plug-in/gimpplugin-message.c:486
 #, c-format
 msgid ""
 "Calling error for procedure '%s':\n"
@@ -12012,7 +13085,7 @@ msgstr ""
 "プロシージャー '%s' の呼出し時にエラーが発生しました。\n"
 "%s"
 
-#: ../app/plug-in/gimpplugin-message.c:494
+#: ../app/plug-in/gimpplugin-message.c:495
 #, c-format
 msgid ""
 "Execution error for procedure '%s':\n"
@@ -12021,7 +13094,7 @@ msgstr ""
 "プロシージャー '%s' の実行時にエラーが発生しました。\n"
 "%s"
 
-#: ../app/plug-in/gimppluginprocedure.c:987
+#: ../app/plug-in/gimppluginprocedure.c:993
 #, c-format
 msgid ""
 "Calling error for '%s':\n"
@@ -12030,7 +13103,7 @@ msgstr ""
 "'%s' の呼出し時にエラーが発生しました。\n"
 "%s"
 
-#: ../app/plug-in/gimppluginprocedure.c:999
+#: ../app/plug-in/gimppluginprocedure.c:1005
 #, c-format
 msgid ""
 "Execution error for '%s':\n"
@@ -12043,38 +13116,49 @@ msgstr ""
 msgid "Cancelled"
 msgstr "キャンセル"
 
-#: ../app/plug-in/plug-in-icc-profile.c:114
-#: ../app/plug-in/plug-in-icc-profile.c:189
-#: ../app/plug-in/plug-in-icc-profile.c:248
+#: ../app/plug-in/plug-in-icc-profile.c:77
+#, c-format
+msgid "Can't apply color profile to grayscale image (%s)"
+msgstr "カラープロファイルはグレースケール画像に適用できません (%s)"
+
+#: ../app/plug-in/plug-in-icc-profile.c:120
+#: ../app/plug-in/plug-in-icc-profile.c:195
+#: ../app/plug-in/plug-in-icc-profile.c:254
 #, c-format
 msgid "Error running '%s'"
 msgstr "'%s' を実行中にエラーが発生しました"
 
-#: ../app/plug-in/plug-in-icc-profile.c:138
-#: ../app/plug-in/plug-in-icc-profile.c:199
-#: ../app/plug-in/plug-in-icc-profile.c:258
+#: ../app/plug-in/plug-in-icc-profile.c:144
+#: ../app/plug-in/plug-in-icc-profile.c:205
+#: ../app/plug-in/plug-in-icc-profile.c:264
 #, c-format
 msgid "Plug-In missing (%s)"
 msgstr "プラグインが見つかりません (%s)"
 
-#: ../app/plug-in/plug-in-rc.c:205
+#: ../app/plug-in/plug-in-rc.c:227
 #, c-format
 msgid "Skipping '%s': wrong GIMP protocol version."
 msgstr "'%s' をスキップ: 不正な GIMP プロトコルバージョンです。"
 
-#: ../app/plug-in/plug-in-rc.c:477
+#: ../app/plug-in/plug-in-rc.c:234
+#, fuzzy, c-format
+#| msgid "Skipping '%s': wrong GIMP protocol version."
+msgid "Skipping '%s': wrong pluginrc file format version."
+msgstr "'%s' をスキップ: 不正な GIMP プロトコルバージョンです。"
+
+#: ../app/plug-in/plug-in-rc.c:506
 #, c-format
 msgid "invalid value '%s' for icon type"
 msgstr "アイコン型として不適切な値 '%s'"
 
-#: ../app/plug-in/plug-in-rc.c:492
+#: ../app/plug-in/plug-in-rc.c:521
 #, c-format
 msgid "invalid value '%ld' for icon type"
 msgstr "アイコン型として不適切な値 '%ld'"
 
 #. This is a so-called pangram; it's supposed to
 #. contain all characters found in the alphabet.
-#: ../app/text/gimpfont.c:43
+#: ../app/text/gimpfont.c:44
 msgid ""
 "Pack my box with\n"
 "five dozen liquor jugs."
@@ -12086,51 +13170,59 @@ msgstr ""
 msgid "Add Text Layer"
 msgstr "テキストレイヤーを追加"
 
-#: ../app/text/gimptextlayer.c:138
+#: ../app/text/gimptextlayer.c:147
 msgid "Text Layer"
 msgstr "テキストレイヤー"
 
-#: ../app/text/gimptextlayer.c:139
+#: ../app/text/gimptextlayer.c:148
 msgid "Rename Text Layer"
 msgstr "テキストレイヤー名の変更"
 
-#: ../app/text/gimptextlayer.c:140
+#: ../app/text/gimptextlayer.c:149
 msgid "Move Text Layer"
 msgstr "テキストレイヤーの移動"
 
-#: ../app/text/gimptextlayer.c:141
+#: ../app/text/gimptextlayer.c:150
 msgid "Scale Text Layer"
 msgstr "テキストレイヤーの拡大・縮小"
 
-#: ../app/text/gimptextlayer.c:142
+#: ../app/text/gimptextlayer.c:151
 msgid "Resize Text Layer"
 msgstr "テキストレイヤーサイズの変更"
 
-#: ../app/text/gimptextlayer.c:143
+#: ../app/text/gimptextlayer.c:152
 msgid "Flip Text Layer"
 msgstr "テキストレイヤーの反転"
 
-#: ../app/text/gimptextlayer.c:144
+#: ../app/text/gimptextlayer.c:153
 msgid "Rotate Text Layer"
 msgstr "テキストレイヤーの回転"
 
-#: ../app/text/gimptextlayer.c:145
+#: ../app/text/gimptextlayer.c:154
 msgid "Transform Text Layer"
 msgstr "テキストレイヤーの変形"
 
-#: ../app/text/gimptextlayer.c:515
+#: ../app/text/gimptextlayer.c:561
 msgid "Discard Text Information"
 msgstr "テキストレイヤーから文字情報を破棄する"
 
-#: ../app/text/gimptextlayer.c:573
+#: ../app/text/gimptextlayer.c:629
 msgid "Due to lack of any fonts, text functionality is not available."
 msgstr "フォントがないので文字機能は利用できません。"
 
-#: ../app/text/gimptextlayer.c:625
+#: ../app/text/gimptextlayer.c:688
 msgid "Empty Text Layer"
 msgstr "空のテキストレイヤー"
 
-#: ../app/text/gimptextlayer-xcf.c:76
+#: ../app/text/gimptextlayer.c:738
+msgid ""
+"Your text cannot be rendered. It is likely too big. Please make it shorter "
+"or use a smaller font."
+msgstr ""
+"描画不可能なテキストです。 大き過ぎませんか。 少し短くするかあるいはもっと小"
+"さなフォントを使用してみてください。"
+
+#: ../app/text/gimptextlayer-xcf.c:77
 #, c-format
 msgid ""
 "Problems parsing the text parasite for layer '%s':\n"
@@ -12145,6 +13237,14 @@ msgstr ""
 "テキストパラサイトに間違いが見られます。(テキストを編集しなければ問題ありませ"
 "ん。)"
 
+#: ../app/text/gimptextlayout.c:578
+msgid ""
+"The new text layout cannot be generated. Most likely the font size is too "
+"big."
+msgstr ""
+"新しいテキストレイアウトが生成できません。 おそらくフォントサイズが大き過ぎま"
+"す。"
+
 #: ../app/text/text-enums.c:23
 msgctxt "text-box-mode"
 msgid "Dynamic"
@@ -12169,8 +13269,10 @@ msgstr "エアブラシで描画(_A)"
 msgid "Motion only"
 msgstr "ブラシ移動時のみ以下を適用"
 
-#: ../app/tools/gimpairbrushtool.c:92 ../app/tools/gimpconvolvetool.c:229
-#: ../app/tools/gimpsmudgetool.c:92
+#: ../app/tools/gimpairbrushtool.c:92
+#, fuzzy
+#| msgid "Rate"
+msgctxt "airbrush-tool"
 msgid "Rate"
 msgstr "割合"
 
@@ -12194,63 +13296,65 @@ msgstr "[並べる] の際の垂直方向のオフセットを指定します"
 msgid "Align"
 msgstr "整列"
 
-#: ../app/tools/gimpalignoptions.c:285
-msgid "Relative to:"
+#: ../app/tools/gimpalignoptions.c:282
+#, fuzzy
+#| msgid "Relative to:"
+msgid "Relative to"
 msgstr "基準:"
 
-#: ../app/tools/gimpalignoptions.c:299
+#: ../app/tools/gimpalignoptions.c:293
 msgid "Align left edge of target"
 msgstr "左揃え"
 
-#: ../app/tools/gimpalignoptions.c:303
+#: ../app/tools/gimpalignoptions.c:297
 msgid "Align center of target"
 msgstr "中央揃え(水平方向の)"
 
-#: ../app/tools/gimpalignoptions.c:307
+#: ../app/tools/gimpalignoptions.c:301
 msgid "Align right edge of target"
 msgstr "右揃え"
 
-#: ../app/tools/gimpalignoptions.c:315
+#: ../app/tools/gimpalignoptions.c:309
 msgid "Align top edge of target"
 msgstr "上揃え"
 
-#: ../app/tools/gimpalignoptions.c:319
+#: ../app/tools/gimpalignoptions.c:313
 msgid "Align middle of target"
 msgstr "中央揃え(垂直方向の)"
 
-#: ../app/tools/gimpalignoptions.c:323
+#: ../app/tools/gimpalignoptions.c:317
 msgid "Align bottom of target"
 msgstr "下揃え"
 
-#: ../app/tools/gimpalignoptions.c:325
+#: ../app/tools/gimpalignoptions.c:319
 msgid "Distribute"
 msgstr "並べる"
 
-#: ../app/tools/gimpalignoptions.c:339
+#: ../app/tools/gimpalignoptions.c:333
 msgid "Distribute left edges of targets"
 msgstr "左端を基準に並べる"
 
-#: ../app/tools/gimpalignoptions.c:343
+#: ../app/tools/gimpalignoptions.c:337
 msgid "Distribute horizontal centers of targets"
 msgstr "中央(水平方向)を基準に並べる"
 
-#: ../app/tools/gimpalignoptions.c:347
+#: ../app/tools/gimpalignoptions.c:341
 msgid "Distribute right edges of targets"
 msgstr "右端を基準に並べる"
 
-#: ../app/tools/gimpalignoptions.c:355
+#: ../app/tools/gimpalignoptions.c:349
 msgid "Distribute top edges of targets"
 msgstr "上端を基準に並べる"
 
-#: ../app/tools/gimpalignoptions.c:359
+#: ../app/tools/gimpalignoptions.c:353
 msgid "Distribute vertical centers of targets"
 msgstr "中央(垂直方向)を基準に並べる"
 
-#: ../app/tools/gimpalignoptions.c:363
+#: ../app/tools/gimpalignoptions.c:357
 msgid "Distribute bottoms of targets"
 msgstr "下端を基準に並べる"
 
-#: ../app/tools/gimpalignoptions.c:369
+#: ../app/tools/gimpalignoptions.c:363
 msgid "Offset:"
 msgstr "オフセット:"
 
@@ -12264,53 +13368,56 @@ msgstr ""
 msgid "_Align"
 msgstr "整列(_A)"
 
-#: ../app/tools/gimpaligntool.c:549
+#: ../app/tools/gimpaligntool.c:548
 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers"
 msgstr ""
 "レイヤー、パスまたはガイドをクリックしたり、複数のレイヤーをクリック-ドラッグ"
 "したりして整列対象にします"
 
-#: ../app/tools/gimpaligntool.c:557
+#: ../app/tools/gimpaligntool.c:556
 msgid "Click to pick this layer as first item"
 msgstr "クリック: このレイヤーを [最初のアイテム] にします"
 
-#: ../app/tools/gimpaligntool.c:564
+#: ../app/tools/gimpaligntool.c:563
 msgid "Click to add this layer to the list"
 msgstr "クリック: このレイヤーを対象に加えます"
 
-#: ../app/tools/gimpaligntool.c:568
+#: ../app/tools/gimpaligntool.c:567
 msgid "Click to pick this guide as first item"
 msgstr "クリック: このガイドを [最初のアイテム] にします"
 
-#: ../app/tools/gimpaligntool.c:575
+#: ../app/tools/gimpaligntool.c:574
 msgid "Click to add this guide to the list"
 msgstr "クリック: このガイドを対象に加えます"
 
-#: ../app/tools/gimpaligntool.c:579
+#: ../app/tools/gimpaligntool.c:578
 msgid "Click to pick this path as first item"
 msgstr "クリック: このパスを [最初のアイテム] にします"
 
-#: ../app/tools/gimpaligntool.c:586
+#: ../app/tools/gimpaligntool.c:585
 msgid "Click to add this path to the list"
 msgstr "クリック: このアイテムを対象に加えます"
 
-#: ../app/tools/gimpblendoptions.c:212 ../app/tools/gimppaintoptions-gui.c:347
+#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:344
 msgid "Gradient"
 msgstr "グラデーション"
 
-#: ../app/tools/gimpblendoptions.c:232 ../app/widgets/gimpbrusheditor.c:140
-msgid "Shape:"
-msgstr "形状:"
+#. Blob shape widgets
+#: ../app/tools/gimpblendoptions.c:221 ../app/tools/gimpinkoptions-gui.c:108
+msgid "Shape"
+msgstr "形状"
 
-#: ../app/tools/gimpblendoptions.c:239 ../app/tools/gimppaintoptions-gui.c:326
-msgid "Repeat:"
+#: ../app/tools/gimpblendoptions.c:230 ../app/tools/gimppaintoptions-gui.c:326
+#, fuzzy
+#| msgid "Repeat:"
+msgid "Repeat"
 msgstr "反復:"
 
-#: ../app/tools/gimpblendoptions.c:262
+#: ../app/tools/gimpblendoptions.c:255
 msgid "Adaptive supersampling"
 msgstr "適応型スーパーサンプリング"
 
-#: ../app/tools/gimpblendoptions.c:269
+#: ../app/tools/gimpblendoptions.c:262
 msgid "Max depth"
 msgstr "最大深度"
 
@@ -12328,59 +13435,71 @@ msgstr ""
 msgid "Blen_d"
 msgstr "ブレンド(_D)"
 
-#: ../app/tools/gimpblendtool.c:180
+#: ../app/tools/gimpblendtool.c:180 ../app/tools/gimpbucketfilltool.c:151
+#: ../app/tools/gimpimagemaptool.c:302 ../app/tools/gimppainttool.c:272
+#: ../app/tools/gimptransformtool.c:286
+#, fuzzy
+#| msgid "The active layer's pixels are locked."
+msgid "The active layer is not visible."
+msgstr "アクティブレイヤー中のすべてのピクセルが保護されています。"
+
+#: ../app/tools/gimpblendtool.c:187
 msgid "No gradient available for use with this tool."
 msgstr "このツールで利用できるグラデーションはありません"
 
-#: ../app/tools/gimpblendtool.c:444 ../app/tools/gimppainttool.c:623
+#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:631
 #, c-format
 msgid "%s for constrained angles"
 msgstr "%s-ドラッグ: 15 度毎に角度をスナップ"
 
-#: ../app/tools/gimpblendtool.c:445
+#: ../app/tools/gimpblendtool.c:453
 #, c-format
 msgid "%s to move the whole line"
 msgstr "%s-ドラッグ: ベクトルを移動"
 
-#: ../app/tools/gimpblendtool.c:449
+#: ../app/tools/gimpblendtool.c:457
 msgid "Blend: "
 msgstr "ブレンド: "
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:105
+#: ../app/tools/gimpbrightnesscontrasttool.c:98
 msgid "Brightness-Contrast"
 msgstr "明るさ-コントラスト"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:106
+#: ../app/tools/gimpbrightnesscontrasttool.c:99
 msgid "Brightness/Contrast Tool: Adjust brightness and contrast"
 msgstr ""
 "[明るさ-コントラスト]\n"
 "明るさとコントラストを調整します"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:107
+#: ../app/tools/gimpbrightnesscontrasttool.c:100
 msgid "B_rightness-Contrast..."
 msgstr "明るさ-コントラスト(_R)..."
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:124
+#: ../app/tools/gimpbrightnesscontrasttool.c:117
 msgid "Adjust Brightness and Contrast"
 msgstr "明るさとコントラストの調整"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:126
+#: ../app/tools/gimpbrightnesscontrasttool.c:119
 msgid "Import Brightness-Contrast settings"
 msgstr "明るさ-コントラスト設定のインポート"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:127
+#: ../app/tools/gimpbrightnesscontrasttool.c:120
 msgid "Export Brightness-Contrast settings"
 msgstr "明るさ-コントラスト設定のエクスポート"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:269
-msgid "_Brightness:"
+#: ../app/tools/gimpbrightnesscontrasttool.c:252
+#, fuzzy
+#| msgid "_Brightness:"
+msgid "_Brightness"
 msgstr "明るさ(_B):"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:282
-msgid "Con_trast:"
+#: ../app/tools/gimpbrightnesscontrasttool.c:261
+#, fuzzy
+#| msgid "Con_trast:"
+msgid "_Contrast"
 msgstr "コントラスト(_T):"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:294
+#: ../app/tools/gimpbrightnesscontrasttool.c:269
 msgid "Edit these Settings as Levels"
 msgstr "この設定をレベルで調整"
 
@@ -12410,42 +13529,44 @@ msgid "Criterion used for determining color similarity"
 msgstr "類似色領域判定時の基準とする要素を指定します"
 
 #. fill type
-#: ../app/tools/gimpbucketfilloptions.c:230
+#: ../app/tools/gimpbucketfilloptions.c:229
 #, c-format
 msgid "Fill Type  (%s)"
 msgstr "塗りつぶし色  (%s)"
 
 #. fill selection
-#: ../app/tools/gimpbucketfilloptions.c:245
+#: ../app/tools/gimpbucketfilloptions.c:244
 #, c-format
 msgid "Affected Area  (%s)"
 msgstr "塗りつぶす範囲 (%s)"
 
-#: ../app/tools/gimpbucketfilloptions.c:249
+#: ../app/tools/gimpbucketfilloptions.c:248
 msgid "Fill whole selection"
 msgstr "選択範囲"
 
-#: ../app/tools/gimpbucketfilloptions.c:250
+#: ../app/tools/gimpbucketfilloptions.c:249
 msgid "Fill similar colors"
 msgstr "類似色領域"
 
-#: ../app/tools/gimpbucketfilloptions.c:259
+#: ../app/tools/gimpbucketfilloptions.c:258
 msgid "Finding Similar Colors"
 msgstr "類似色の識別"
 
-#: ../app/tools/gimpbucketfilloptions.c:274
+#: ../app/tools/gimpbucketfilloptions.c:273
 msgid "Fill transparent areas"
 msgstr "透明領域を塗りつぶす"
 
-#: ../app/tools/gimpbucketfilloptions.c:280 ../app/tools/gimpclonetool.c:115
-#: ../app/tools/gimpcolorpickeroptions.c:159 ../app/tools/gimphealtool.c:101
-#: ../app/tools/gimpperspectiveclonetool.c:904
-#: ../app/tools/gimpregionselectoptions.c:211
+#: ../app/tools/gimpbucketfilloptions.c:279
+#: ../app/tools/gimpcloneoptions-gui.c:80
+#: ../app/tools/gimpcolorpickeroptions.c:159 ../app/tools/gimphealtool.c:99
+#: ../app/tools/gimpregionselectoptions.c:209
 msgid "Sample merged"
 msgstr "見えている色で"
 
-#: ../app/tools/gimpbucketfilloptions.c:299
-msgid "Fill by:"
+#: ../app/tools/gimpbucketfilloptions.c:292
+#, fuzzy
+#| msgid "Fill by:"
+msgid "Fill by"
 msgstr "判定基準:"
 
 #: ../app/tools/gimpbucketfilltool.c:87
@@ -12481,200 +13602,217 @@ msgctxt "command"
 msgid "Select by Color"
 msgstr "色域を選択"
 
-#: ../app/tools/gimpcagetool.c:151 ../app/tools/gimpcagetool.c:1191
+#: ../app/tools/gimpcageoptions.c:144
+#, fuzzy
+#| msgid "Fill the original position of the cage with a plain color"
+msgid ""
+"Fill the original position\n"
+"of the cage with a color"
+msgstr "初期ケージ内を単色で塗りつぶす"
+
+#: ../app/tools/gimpcagetool.c:156 ../app/tools/gimpcagetool.c:1159
 msgid "Cage Transform"
 msgstr "ケージ変形"
 
-#: ../app/tools/gimpcagetool.c:152
+#: ../app/tools/gimpcagetool.c:157
 msgid "Cage Transform: Deform a selection with a cage"
 msgstr ""
 "[ケージ変形]\n"
 "ケージで囲まれた部分を自由に変形します"
 
-#: ../app/tools/gimpcagetool.c:153
+#: ../app/tools/gimpcagetool.c:158
 msgid "_Cage Transform"
 msgstr "ケージ変形(_C)"
 
-#: ../app/tools/gimpcagetool.c:350
+#: ../app/tools/gimpcagetool.c:354 ../app/tools/gimpwarptool.c:293
 msgid "Press ENTER to commit the transform"
 msgstr "Enter/Return: 変形を確定します"
 
-#: ../app/tools/gimpcagetool.c:1094
+#: ../app/tools/gimpcagetool.c:1062
 msgid "Computing Cage Coefficients"
 msgstr "ケージ係数を計算中"
 
-#: ../app/tools/gimpcagetool.c:1242
+#: ../app/tools/gimpcagetool.c:1210
 msgid "Cage transform"
 msgstr "ケージ変形"
 
-#: ../app/tools/gimpclonetool.c:62
+#: ../app/tools/gimpcloneoptions-gui.c:70
+msgid "Source"
+msgstr "スタンプソース"
+
+#: ../app/tools/gimpcloneoptions-gui.c:103 ../app/tools/gimphealtool.c:105
+#, fuzzy
+#| msgid "Alignment:"
+msgid "Alignment"
+msgstr "位置合わせ:"
+
+#: ../app/tools/gimpclonetool.c:57
 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush"
 msgstr ""
 "[スタンプで描画]\n"
 "ブラシを使って、画像からの選択的なコピーまたはパターンを描画します"
 
 # 直訳は「クローン」ということになろうが、旧バージョンから「スタンプ」が採用されている、アイコンがスタンプの形をしている、Photoshop 
での類似機能でも「スタンプ」が採用されていることから、これまでからの「スタンプ」を踏襲した
-#: ../app/tools/gimpclonetool.c:63
+#: ../app/tools/gimpclonetool.c:58
 msgid "_Clone"
 msgstr "スタンプで描画(_C)"
 
-#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:89
+#: ../app/tools/gimpclonetool.c:81 ../app/tools/gimpclonetool.c:84
 msgid "Click to clone"
 msgstr "クリック: スタンプ描画します"
 
-#: ../app/tools/gimpclonetool.c:87 ../app/tools/gimpclonetool.c:92
+#: ../app/tools/gimpclonetool.c:82 ../app/tools/gimpclonetool.c:87
 #, c-format
 msgid "%s to set a new clone source"
 msgstr "%s-クリック: 新たなスタンプソースを設定"
 
 #. Translators: the translation of "Click" must be the first word
-#: ../app/tools/gimpclonetool.c:91
+#: ../app/tools/gimpclonetool.c:86
 msgid "Click to set a new clone source"
 msgstr "クリック: 新たなスタンプソースを設定します"
 
-#: ../app/tools/gimpclonetool.c:110
-#: ../app/tools/gimpperspectiveclonetool.c:899
-msgid "Source"
-msgstr "スタンプソース"
-
-#: ../app/tools/gimpclonetool.c:129 ../app/tools/gimphealtool.c:110
-#: ../app/tools/gimpperspectiveclonetool.c:918
-msgid "Alignment:"
-msgstr "位置合わせ:"
-
-#: ../app/tools/gimpcolorbalancetool.c:89
+#: ../app/tools/gimpcolorbalancetool.c:78
 msgid "Color Balance"
 msgstr "カラーバランス"
 
-#: ../app/tools/gimpcolorbalancetool.c:90
+#: ../app/tools/gimpcolorbalancetool.c:79
 msgid "Color Balance Tool: Adjust color distribution"
 msgstr ""
 "[カラーバランス]\n"
 "カラーバランスを調整します"
 
-#: ../app/tools/gimpcolorbalancetool.c:91
+#: ../app/tools/gimpcolorbalancetool.c:80
 msgid "Color _Balance..."
 msgstr "カラーバランス(_B)..."
 
-#: ../app/tools/gimpcolorbalancetool.c:105
+#: ../app/tools/gimpcolorbalancetool.c:94
 msgid "Adjust Color Balance"
 msgstr "カラーバランスの調整"
 
-#: ../app/tools/gimpcolorbalancetool.c:107
+#: ../app/tools/gimpcolorbalancetool.c:96
 msgid "Import Color Balance Settings"
 msgstr "カラーバランス設定のインポート"
 
-#: ../app/tools/gimpcolorbalancetool.c:108
+#: ../app/tools/gimpcolorbalancetool.c:97
 msgid "Export Color Balance Settings"
 msgstr "カラーバランス設定のエクスポート"
 
-#: ../app/tools/gimpcolorbalancetool.c:135
+#: ../app/tools/gimpcolorbalancetool.c:123
 msgid "Color Balance operates only on RGB color layers."
 msgstr "カラーバランスの調整は RGB レイヤーにのみ有効です。"
 
-#: ../app/tools/gimpcolorbalancetool.c:231
+#: ../app/tools/gimpcolorbalancetool.c:196
 msgid "Select Range to Adjust"
 msgstr "調整する範囲の選択"
 
-#: ../app/tools/gimpcolorbalancetool.c:240 ../app/tools/gimplevelstool.c:160
+#: ../app/tools/gimpcolorbalancetool.c:201 ../app/tools/gimplevelstool.c:155
 msgid "Adjust Color Levels"
 msgstr "色レベルの調整"
 
-#: ../app/tools/gimpcolorbalancetool.c:257
-#: ../app/tools/gimphuesaturationtool.c:216
+#: ../app/tools/gimpcolorbalancetool.c:217
+#: ../app/tools/gimphuesaturationtool.c:200
 msgid "Cyan"
 msgstr "シアン"
 
-#: ../app/tools/gimpcolorbalancetool.c:257
-#: ../app/tools/gimphuesaturationtool.c:213
+#: ../app/tools/gimpcolorbalancetool.c:217
+#: ../app/tools/gimphuesaturationtool.c:197
 msgid "Red"
 msgstr "赤"
 
-#: ../app/tools/gimpcolorbalancetool.c:266
-#: ../app/tools/gimphuesaturationtool.c:218
+#: ../app/tools/gimpcolorbalancetool.c:221
+#: ../app/tools/gimphuesaturationtool.c:202
 msgid "Magenta"
 msgstr "マゼンタ"
 
-#: ../app/tools/gimpcolorbalancetool.c:266
-#: ../app/tools/gimphuesaturationtool.c:215
+#: ../app/tools/gimpcolorbalancetool.c:221
+#: ../app/tools/gimphuesaturationtool.c:199
 msgid "Green"
 msgstr "緑"
 
-#: ../app/tools/gimpcolorbalancetool.c:275
-#: ../app/tools/gimphuesaturationtool.c:214
+#: ../app/tools/gimpcolorbalancetool.c:225
+#: ../app/tools/gimphuesaturationtool.c:198
 msgid "Yellow"
 msgstr "イエロー"
 
-#: ../app/tools/gimpcolorbalancetool.c:275
-#: ../app/tools/gimphuesaturationtool.c:217
+#: ../app/tools/gimpcolorbalancetool.c:225
+#: ../app/tools/gimphuesaturationtool.c:201
 msgid "Blue"
 msgstr "青"
 
-#: ../app/tools/gimpcolorbalancetool.c:286
+#: ../app/tools/gimpcolorbalancetool.c:232
 msgid "R_eset Range"
 msgstr "範囲のリセット(_E)"
 
-#: ../app/tools/gimpcolorbalancetool.c:295
+#: ../app/tools/gimpcolorbalancetool.c:242
 msgid "Preserve _luminosity"
 msgstr "輝度の保持(_L)"
 
-#: ../app/tools/gimpcolorizetool.c:93
+#: ../app/tools/gimpcolorizetool.c:81
 msgid "Colorize"
 msgstr "着色"
 
-#: ../app/tools/gimpcolorizetool.c:94
+#: ../app/tools/gimpcolorizetool.c:82
 msgid "Colorize Tool: Colorize the image"
 msgstr ""
 "[着色]\n"
 "画像に着色します"
 
-#: ../app/tools/gimpcolorizetool.c:95
+#: ../app/tools/gimpcolorizetool.c:83
 msgid "Colori_ze..."
 msgstr "着色(_Z)..."
 
-#: ../app/tools/gimpcolorizetool.c:109
+#: ../app/tools/gimpcolorizetool.c:97
 msgid "Colorize the Image"
 msgstr "画像の着色"
 
-#: ../app/tools/gimpcolorizetool.c:111
+#: ../app/tools/gimpcolorizetool.c:99
 msgid "Import Colorize Settings"
 msgstr "着色設定のインポート"
 
-#: ../app/tools/gimpcolorizetool.c:112
+#: ../app/tools/gimpcolorizetool.c:100
 msgid "Export Colorize Settings"
 msgstr "着色設定のエクスポート"
 
-#: ../app/tools/gimpcolorizetool.c:139
+#: ../app/tools/gimpcolorizetool.c:126
 #, fuzzy
+#| msgid "Posterize does not operate on indexed layers."
 msgid "Colorize does not operate on grayscale layers."
 msgstr "インデックスレイヤーに対してはポスター化の操作はできません。"
 
-#: ../app/tools/gimpcolorizetool.c:201
+#: ../app/tools/gimpcolorizetool.c:164
 msgid "Select Color"
 msgstr "色の選択"
 
-#: ../app/tools/gimpcolorizetool.c:218
-#: ../app/tools/gimphuesaturationtool.c:346
-msgid "_Hue:"
+#: ../app/tools/gimpcolorizetool.c:174
+#: ../app/tools/gimphuesaturationtool.c:303
+#, fuzzy
+#| msgid "_Hue:"
+msgid "_Hue"
 msgstr "色相(_H):"
 
-#: ../app/tools/gimpcolorizetool.c:231
-#: ../app/tools/gimphuesaturationtool.c:378
-msgid "_Saturation:"
+#: ../app/tools/gimpcolorizetool.c:181
+#: ../app/tools/gimphuesaturationtool.c:317
+#, fuzzy
+#| msgid "_Saturation:"
+msgid "_Saturation"
 msgstr "彩度(_S):"
 
-#: ../app/tools/gimpcolorizetool.c:244
-#: ../app/tools/gimphuesaturationtool.c:362
-msgid "_Lightness:"
+#: ../app/tools/gimpcolorizetool.c:188
+#: ../app/tools/gimphuesaturationtool.c:310
+#, fuzzy
+#| msgid "_Lightness:"
+msgid "_Lightness"
 msgstr "輝度(_L):"
 
-#: ../app/tools/gimpcolorizetool.c:262
+#: ../app/tools/gimpcolorizetool.c:199
 #, fuzzy
+#| msgid "Colorize"
 msgid "Colorize Color"
 msgstr "着色"
 
-#: ../app/tools/gimpcolorizetool.c:280 ../app/widgets/gimppropwidgets.c:1528
+#: ../app/tools/gimpcolorizetool.c:211
 #, fuzzy
+#| msgid "Use color from gradient"
 msgid "Pick color from image"
 msgstr "グラデーションで描く"
 
@@ -12718,53 +13856,53 @@ msgstr "スポイトモード  (%s)"
 msgid "Use info window  (%s)"
 msgstr "情報ウィンドウを使用  (%s)"
 
-#: ../app/tools/gimpcolorpickertool.c:93
+#: ../app/tools/gimpcolorpickertool.c:95
 msgid "Color Picker"
 msgstr "スポイト"
 
-#: ../app/tools/gimpcolorpickertool.c:94
+#: ../app/tools/gimpcolorpickertool.c:96
 msgid "Color Picker Tool: Set colors from image pixels"
 msgstr ""
 "[スポイト]\n"
 "画像のピクセルから色を抜き出します"
 
-#: ../app/tools/gimpcolorpickertool.c:95
+#: ../app/tools/gimpcolorpickertool.c:97
 msgid "C_olor Picker"
 msgstr "スポイト(_O)"
 
-#: ../app/tools/gimpcolorpickertool.c:231
+#: ../app/tools/gimpcolorpickertool.c:232
 msgid "Click in any image to view its color"
 msgstr "クリックされたピクセルの色情報を表示します"
 
-#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:477
+#: ../app/tools/gimpcolorpickertool.c:239 ../app/tools/gimppainttool.c:484
 msgid "Click in any image to pick the foreground color"
 msgstr "クリックされたピクセルの色を描画色に設定します"
 
-#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:483
+#: ../app/tools/gimpcolorpickertool.c:247 ../app/tools/gimppainttool.c:490
 msgid "Click in any image to pick the background color"
 msgstr "クリックされたピクセルの色を背景色に設定します"
 
-#: ../app/tools/gimpcolorpickertool.c:254
+#: ../app/tools/gimpcolorpickertool.c:255
 msgid "Click in any image to add the color to the palette"
 msgstr "クリックされたピクセルの色をパレットに追加します"
 
-#: ../app/tools/gimpcolorpickertool.c:309
+#: ../app/tools/gimpcolorpickertool.c:311
 msgid "Color Picker Information"
 msgstr "スポイト情報"
 
-#: ../app/tools/gimpcolortool.c:230 ../app/tools/gimpcolortool.c:403
+#: ../app/tools/gimpcolortool.c:234 ../app/tools/gimpcolortool.c:407
 msgid "Move Sample Point: "
 msgstr "サンプルポイントの移動: "
 
-#: ../app/tools/gimpcolortool.c:395
+#: ../app/tools/gimpcolortool.c:399
 msgid "Remove Sample Point"
 msgstr "サンプルポイントを削除"
 
-#: ../app/tools/gimpcolortool.c:396
+#: ../app/tools/gimpcolortool.c:400
 msgid "Cancel Sample Point"
 msgstr "サンプルポイントの取り消し"
 
-#: ../app/tools/gimpcolortool.c:404
+#: ../app/tools/gimpcolortool.c:408
 msgid "Add Sample Point: "
 msgstr "サンプルポイントの追加: "
 
@@ -12814,6 +13952,13 @@ msgstr "%s-クリック: ぼかします"
 msgid "Convolve Type  (%s)"
 msgstr "色混ぜの種類  (%s)"
 
+#: ../app/tools/gimpconvolvetool.c:229
+#, fuzzy
+#| msgid "Rate"
+msgctxt "convolve-tool"
+msgid "Rate"
+msgstr "割合"
+
 #: ../app/tools/gimpcropoptions.c:77
 #: ../app/tools/gimprectangleselectoptions.c:78
 msgid "Dim everything outside selection"
@@ -12851,7 +13996,7 @@ msgstr ""
 msgid "_Crop"
 msgstr "切り抜き(_C)"
 
-#: ../app/tools/gimpcroptool.c:253
+#: ../app/tools/gimpcroptool.c:252
 msgid "Click or press Enter to crop"
 msgstr "クリックまたは Enter/Return: 切り抜きます"
 
@@ -12859,88 +14004,88 @@ msgstr "クリックまたは Enter/Return: 切り抜きます"
 msgid "There is no active layer to crop."
 msgstr "切り取り元のアクティブレイヤーがありません。"
 
-#: ../app/tools/gimpcurvestool.c:144
+#: ../app/tools/gimpcurvestool.c:147
 msgid "Curves"
 msgstr "トーンカーブ"
 
-#: ../app/tools/gimpcurvestool.c:145
+#: ../app/tools/gimpcurvestool.c:148
 msgid "Curves Tool: Adjust color curves"
 msgstr ""
 "[トーンカーブ]\n"
 "色カーブの調整をおこないます"
 
-#: ../app/tools/gimpcurvestool.c:146
+#: ../app/tools/gimpcurvestool.c:149
 msgid "_Curves..."
 msgstr "トーンカーブ(_C)..."
 
-#: ../app/tools/gimpcurvestool.c:169
+#: ../app/tools/gimpcurvestool.c:172
 msgid "Adjust Color Curves"
 msgstr "トーンカーブの調整"
 
-#: ../app/tools/gimpcurvestool.c:171
+#: ../app/tools/gimpcurvestool.c:174
 msgid "Import Curves"
 msgstr "カーブ設定のインポート"
 
-#: ../app/tools/gimpcurvestool.c:172
+#: ../app/tools/gimpcurvestool.c:175
 msgid "Export Curves"
 msgstr "カーブのエクスポート"
 
-#: ../app/tools/gimpcurvestool.c:307
+#: ../app/tools/gimpcurvestool.c:319
 msgid "Click to add a control point"
 msgstr "クリック: コントロールポイントを追加します"
 
-#: ../app/tools/gimpcurvestool.c:312
+#: ../app/tools/gimpcurvestool.c:324
 msgid "Click to add control points to all channels"
 msgstr "クリック: すべてのチャンネルにコントロールポイントを追加します"
 
-#: ../app/tools/gimpcurvestool.c:317
+#: ../app/tools/gimpcurvestool.c:329
 msgid "Click to locate on curve (try Shift, Ctrl)"
 msgstr ""
 "クリックした場所のトーンをダイアログ上に示します (Shift-クリック、Ctrl-クリッ"
 "クもできます)"
 
-#: ../app/tools/gimpcurvestool.c:414 ../app/tools/gimplevelstool.c:320
+#: ../app/tools/gimpcurvestool.c:423 ../app/tools/gimplevelstool.c:332
 msgid "Cha_nnel:"
 msgstr "チャンネル(_N):"
 
-#: ../app/tools/gimpcurvestool.c:440 ../app/tools/gimplevelstool.c:344
+#: ../app/tools/gimpcurvestool.c:449 ../app/tools/gimplevelstool.c:356
 msgid "R_eset Channel"
 msgstr "チャンネルのリセット(_E)"
 
-#: ../app/tools/gimpcurvestool.c:534 ../app/widgets/gimpdeviceinfoeditor.c:459
+#: ../app/tools/gimpcurvestool.c:543 ../app/widgets/gimpdeviceinfoeditor.c:461
 msgid "Curve _type:"
 msgstr "カーブの種類(_T)"
 
-#: ../app/tools/gimpcurvestool.c:609 ../app/tools/gimplevelstool.c:679
+#: ../app/tools/gimpcurvestool.c:618 ../app/tools/gimplevelstool.c:641
 #, c-format
 msgid "Could not read header from '%s': %s"
 msgstr ""
 "'%s' からヘッダーを読み込めません。\n"
 "%s"
 
-#: ../app/tools/gimpcurvestool.c:682
+#: ../app/tools/gimpcurvestool.c:691
 msgid "Use _old curves file format"
 msgstr "旧カーブファイルフォーマットを使用する(_O)"
 
-#: ../app/tools/gimpdesaturatetool.c:75
+#: ../app/tools/gimpdesaturatetool.c:68
 msgid "Desaturate Tool: Turn colors into shades of gray"
 msgstr ""
 "[脱色]\n"
 "色をモノクロの階調に変換します。(グレースケールへの変換ではありません。)"
 
-#: ../app/tools/gimpdesaturatetool.c:76
+#: ../app/tools/gimpdesaturatetool.c:69
 msgid "_Desaturate..."
 msgstr "脱色(_D)..."
 
-#: ../app/tools/gimpdesaturatetool.c:90
+#: ../app/tools/gimpdesaturatetool.c:83
 msgid "Desaturate (Remove Colors)"
 msgstr "脱色(色削除)"
 
-#: ../app/tools/gimpdesaturatetool.c:116
+#: ../app/tools/gimpdesaturatetool.c:108
 msgid "Desaturate only operates on RGB layers."
 msgstr "RGB レイヤー以外では脱色できません"
 
-#: ../app/tools/gimpdesaturatetool.c:177
+#: ../app/tools/gimpdesaturatetool.c:142
 msgid "Choose shade of gray based on:"
 msgstr "脱色の基準にする要素:"
 
@@ -13103,11 +14248,7 @@ msgctxt "undo-desc"
 msgid "Flip"
 msgstr "鏡像反転"
 
-#: ../app/tools/gimpforegroundselectoptions.c:86
-msgid "Select a single contiguous area"
-msgstr "ひとかたまりの領域を抽出します"
-
-#: ../app/tools/gimpforegroundselectoptions.c:92
+#: ../app/tools/gimpforegroundselectoptions.c:84
 msgid ""
 "Paint over areas to mark color values for inclusion or exclusion from "
 "selection"
@@ -13115,106 +14256,97 @@ msgstr ""
 "抽出部分に含める、または抽出部分から除外する箇所をそれぞれのマークカラーで上"
 "塗りします"
 
-#: ../app/tools/gimpforegroundselectoptions.c:99
+#: ../app/tools/gimpforegroundselectoptions.c:92
 msgid "Size of the brush used for refinements"
 msgstr "抽出部分の修正に使用するブラシサイズを指定します"
 
-#: ../app/tools/gimpforegroundselectoptions.c:105
-msgid ""
-"Smaller values give a more accurate selection border but may introduce holes "
-"in the selection"
-msgstr ""
-"スムージングの値を設定します\n"
-"値を小さくするとより正確に境界を判別しますが\n"
-"抽出領域に穴が出来るかもしれません"
-
-#: ../app/tools/gimpforegroundselectoptions.c:113
+#: ../app/tools/gimpforegroundselectoptions.c:98
 msgid "Color of selection preview mask"
 msgstr "選択範囲候補の表示色を指定します"
 
-#: ../app/tools/gimpforegroundselectoptions.c:125
-msgid "Sensitivity for brightness component"
-msgstr "明度への感度"
-
-#: ../app/tools/gimpforegroundselectoptions.c:131
-msgid "Sensitivity for red/green component"
-msgstr "赤/緑への感度"
-
-#: ../app/tools/gimpforegroundselectoptions.c:137
-msgid "Sensitivity for yellow/blue component"
-msgstr "黄/青への感度"
+#: ../app/tools/gimpforegroundselectoptions.c:105
+msgid "Matting engine to use"
+msgstr ""
 
-#. single / multiple objects
-#: ../app/tools/gimpforegroundselectoptions.c:282
-msgid "Contiguous"
-msgstr "単一領域を抽出"
+#: ../app/tools/gimpforegroundselectoptions.c:112
+#: ../app/tools/gimpforegroundselectoptions.c:118
+msgid "Parameter for matting-levin"
+msgstr ""
 
-#. foreground / background
-#: ../app/tools/gimpforegroundselectoptions.c:287
-#, c-format
-msgid "Interactive refinement  (%s)"
-msgstr "抽出部分の修正(%s)"
+#: ../app/tools/gimpforegroundselectoptions.c:124
+msgid "Parameter for matting-global"
+msgstr ""
 
-#: ../app/tools/gimpforegroundselectoptions.c:291
-msgid "Mark background"
-msgstr "背景部分をマーク"
+#: ../app/tools/gimpforegroundselectoptions.c:255
+#, fuzzy
+#| msgid "Paint Mode"
+msgid "Draw Mode"
+msgstr "描画モードを指定します"
 
-#: ../app/tools/gimpforegroundselectoptions.c:292
-msgid "Mark foreground"
-msgstr "前景部分をマーク"
+#: ../app/tools/gimpforegroundselectoptions.c:266
+#, fuzzy
+#| msgid "Stroke Path"
+msgid "Stroke width"
+msgstr "パスの境界線を描画"
 
-#: ../app/tools/gimpforegroundselectoptions.c:308
-msgid "Small brush"
-msgstr "小さいブラシ"
+#: ../app/tools/gimpforegroundselectoptions.c:285
+#, fuzzy
+#| msgid "Reset size to brush's native size"
+msgid "Reset stroke width native size"
+msgstr "ブラシを本来のサイズに戻します"
 
-#: ../app/tools/gimpforegroundselectoptions.c:316
-msgid "Large brush"
-msgstr "大きいブラシ"
+#: ../app/tools/gimpforegroundselectoptions.c:290
+#, fuzzy
+#| msgid "Preview color:"
+msgid "Preview color"
+msgstr "プレビュー色:"
 
-#: ../app/tools/gimpforegroundselectoptions.c:339
-msgid "Smoothing:"
-msgstr "スムージング:"
+#: ../app/tools/gimpforegroundselectoptions.c:301
+msgid "Engine"
+msgstr ""
 
-#: ../app/tools/gimpforegroundselectoptions.c:345
-msgid "Preview color:"
-msgstr "プレビュー色:"
+#: ../app/tools/gimpforegroundselectoptions.c:325
+#, fuzzy
+#| msgid "Active Filters"
+msgid "Active levels"
+msgstr "アクティブなフィルター"
 
-#. granularity
-#: ../app/tools/gimpforegroundselectoptions.c:348
-msgid "Color Sensitivity"
-msgstr "色感度"
+#: ../app/tools/gimpforegroundselectoptions.c:338
+#, fuzzy
+#| msgid "Interpolation:"
+msgid "Iterations"
+msgstr "補間アルゴリズム:"
 
-#: ../app/tools/gimpforegroundselecttool.c:144
+#: ../app/tools/gimpforegroundselecttool.c:149
 msgid "Foreground Select"
 msgstr "前景抽出選択"
 
-#: ../app/tools/gimpforegroundselecttool.c:145
+#: ../app/tools/gimpforegroundselecttool.c:150
 msgid "Foreground Select Tool: Select a region containing foreground objects"
 msgstr ""
 "[前景抽出選択]\n"
 "画像から前景のオブジェクトを抽出し、選択範囲を作成します"
 
-#: ../app/tools/gimpforegroundselecttool.c:146
+#: ../app/tools/gimpforegroundselecttool.c:151
 msgid "F_oreground Select"
 msgstr "前景抽出選択(_O)"
 
-#: ../app/tools/gimpforegroundselecttool.c:302
-msgid "Add more strokes or press Enter to accept the selection"
+#: ../app/tools/gimpforegroundselecttool.c:283
+msgid ""
+"Paint trimap, (background, foreground and unknown) or press Enter to preview"
 msgstr ""
-"さらになぞって抽出部分を修正、または Enter/Return キーで選択範囲を確定します"
-
-#: ../app/tools/gimpforegroundselecttool.c:304
-msgid "Mark foreground by painting on the object to extract"
-msgstr "抽出したい部分を塗って前景部分を指定します"
 
-#: ../app/tools/gimpforegroundselecttool.c:309
+#: ../app/tools/gimpforegroundselecttool.c:288
 msgid "Roughly outline the object to extract"
 msgstr "抽出したい部分の輪郭をおおまかに描きます"
 
-#: ../app/tools/gimpforegroundselecttool.c:751
-msgctxt "command"
-msgid "Foreground Select"
-msgstr "前景抽出選択"
+#: ../app/tools/gimpforegroundselecttool.c:292
+msgid "Press escape for return to trimap or Enter to apply"
+msgstr ""
+
+#: ../app/tools/gimpforegroundselecttool.c:748
+msgid "Computing alpha of unknown pixels"
+msgstr ""
 
 #: ../app/tools/gimpfreeselecttool.c:197
 msgid ""
@@ -13272,7 +14404,7 @@ msgid "Fuzzy Select"
 msgstr "ファジー選択"
 
 #: ../app/tools/gimpgegltool.c:72 ../app/tools/gimpgegltool.c:85
-#: ../app/tools/gimpoperationtool.c:100 ../app/tools/gimpoperationtool.c:119
+#: ../app/tools/gimpoperationtool.c:108 ../app/tools/gimpoperationtool.c:128
 msgid "GEGL Operation"
 msgstr "GEGL 操作"
 
@@ -13283,11 +14415,11 @@ msgstr ""
 "任意の GEGL 操作を行い画像に変化を与えます。 GEGL 操作はインデックスレイヤー"
 "では利用できません。"
 
-#: ../app/tools/gimpgegltool.c:74 ../app/tools/gimpoperationtool.c:102
+#: ../app/tools/gimpgegltool.c:74 ../app/tools/gimpoperationtool.c:110
 msgid "_GEGL Operation..."
 msgstr "GEGL 操作(_G)..."
 
-#: ../app/tools/gimpgegltool.c:319
+#: ../app/tools/gimpgegltool.c:371
 msgid "Select an operation from the list above"
 msgstr "上の一覧からオペレーションを選択してください"
 
@@ -13319,89 +14451,91 @@ msgstr "クリック: 新しい修復ソースを設定します"
 msgid "Histogram Scale"
 msgstr "ヒストグラムの種類"
 
-#: ../app/tools/gimphuesaturationtool.c:98
+#: ../app/tools/gimphuesaturationtool.c:92
 msgid "Hue-Saturation Tool: Adjust hue, saturation, and lightness"
 msgstr ""
 "[色相-彩度...]\n"
 "色相・彩度・輝度を調整します"
 
-#: ../app/tools/gimphuesaturationtool.c:99
+#: ../app/tools/gimphuesaturationtool.c:93
 msgid "Hue-_Saturation..."
 msgstr "色相-彩度(_S)..."
 
-#: ../app/tools/gimphuesaturationtool.c:113
+#: ../app/tools/gimphuesaturationtool.c:107
 msgid "Adjust Hue / Lightness / Saturation"
 msgstr "色相・輝度・彩度の調整"
 
-#: ../app/tools/gimphuesaturationtool.c:115
+#: ../app/tools/gimphuesaturationtool.c:109
 msgid "Import Hue-Saturation Settings"
 msgstr "色相-彩度...設定のインポート"
 
-#: ../app/tools/gimphuesaturationtool.c:116
+#: ../app/tools/gimphuesaturationtool.c:110
 msgid "Export Hue-Saturation Settings"
 msgstr "色相-彩度...設定のエクスポート"
 
-#: ../app/tools/gimphuesaturationtool.c:143
+#: ../app/tools/gimphuesaturationtool.c:136
 msgid "Hue-Saturation operates only on RGB color layers."
 msgstr "色相-彩度の操作は RGB レイヤーにのみ有効です。"
 
-#: ../app/tools/gimphuesaturationtool.c:212
+#: ../app/tools/gimphuesaturationtool.c:196
 msgid "M_aster"
 msgstr "マスター(_A)"
 
-#: ../app/tools/gimphuesaturationtool.c:212
+#: ../app/tools/gimphuesaturationtool.c:196
 msgid "Adjust all colors"
 msgstr "すべての色を調整"
 
-#: ../app/tools/gimphuesaturationtool.c:213
+#: ../app/tools/gimphuesaturationtool.c:197
 msgid "_R"
 msgstr "_R"
 
-#: ../app/tools/gimphuesaturationtool.c:214
+#: ../app/tools/gimphuesaturationtool.c:198
 msgid "_Y"
 msgstr "_Y"
 
-#: ../app/tools/gimphuesaturationtool.c:215
+#: ../app/tools/gimphuesaturationtool.c:199
 msgid "_G"
 msgstr "_G"
 
-#: ../app/tools/gimphuesaturationtool.c:216
+#: ../app/tools/gimphuesaturationtool.c:200
 msgid "_C"
 msgstr "_C"
 
-#: ../app/tools/gimphuesaturationtool.c:217
+#: ../app/tools/gimphuesaturationtool.c:201
 msgid "_B"
 msgstr "_B"
 
-#: ../app/tools/gimphuesaturationtool.c:218
+#: ../app/tools/gimphuesaturationtool.c:202
 msgid "_M"
 msgstr "_M"
 
-#: ../app/tools/gimphuesaturationtool.c:223
+#: ../app/tools/gimphuesaturationtool.c:207
 msgid "Select Primary Color to Adjust"
 msgstr "調整する基準色を選択"
 
-#: ../app/tools/gimphuesaturationtool.c:313
-msgid "_Overlap:"
+#: ../app/tools/gimphuesaturationtool.c:288
+#, fuzzy
+#| msgid "_Overlap:"
+msgid "_Overlap"
 msgstr "オーバーラップ(_O):"
 
-#: ../app/tools/gimphuesaturationtool.c:329
+#: ../app/tools/gimphuesaturationtool.c:293
 msgid "Adjust Selected Color"
 msgstr "選択した色を調整"
 
-#: ../app/tools/gimphuesaturationtool.c:396
+#: ../app/tools/gimphuesaturationtool.c:326
 msgid "R_eset Color"
 msgstr "色のリセット(_E)"
 
-#: ../app/tools/gimpimagemaptool.c:403
+#: ../app/tools/gimpimagemaptool.c:383
 msgid "_Preview"
 msgstr "プレビュー(_P)"
 
-#: ../app/tools/gimpimagemaptool-settings.c:83
+#: ../app/tools/gimpimagemaptool-settings.c:84
 msgid "Pre_sets:"
 msgstr "プリセット(_S):"
 
-#: ../app/tools/gimpimagemaptool-settings.c:215
+#: ../app/tools/gimpimagemaptool-settings.c:216
 #, c-format
 msgid "Settings saved to '%s'"
 msgstr "設定は '%s' で保存されました"
@@ -13412,12 +14546,12 @@ msgid "Adjustment"
 msgstr "補正"
 
 #: ../app/tools/gimpinkoptions-gui.c:65 ../app/tools/gimpinkoptions-gui.c:88
-#: ../app/tools/gimppaintoptions-gui.c:134
+#: ../app/tools/gimppaintoptions-gui.c:138 ../app/tools/gimpwarpoptions.c:180
 msgid "Size"
 msgstr "サイズ"
 
 #: ../app/tools/gimpinkoptions-gui.c:72
-#: ../app/tools/gimppaintoptions-gui.c:184
+#: ../app/tools/gimppaintoptions-gui.c:188
 #: ../app/widgets/gimpbrusheditor.c:200
 msgid "Angle"
 msgstr "角度"
@@ -13437,11 +14571,6 @@ msgstr "傾き"
 msgid "Speed"
 msgstr "スピード"
 
-#. Blob shape widgets
-#: ../app/tools/gimpinkoptions-gui.c:108
-msgid "Shape"
-msgstr "形状"
-
 #: ../app/tools/gimpinktool.c:56
 msgid "Ink Tool: Calligraphy-style painting"
 msgstr ""
@@ -13462,111 +14591,111 @@ msgstr ""
 msgid "Interactive boundary"
 msgstr "新規ノード追加時に境界を表示"
 
-#: ../app/tools/gimpiscissorstool.c:275
+#: ../app/tools/gimpiscissorstool.c:278
 msgid "Scissors"
 msgstr "電脳はさみ"
 
-#: ../app/tools/gimpiscissorstool.c:276
+#: ../app/tools/gimpiscissorstool.c:279
 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting"
 msgstr ""
 "[電脳はさみ]\n"
 "境界を自動計算して、その形状で選択範囲を作成します"
 
-#: ../app/tools/gimpiscissorstool.c:277
+#: ../app/tools/gimpiscissorstool.c:280
 msgid "Intelligent _Scissors"
 msgstr "電脳はさみ(_S)"
 
-#: ../app/tools/gimpiscissorstool.c:900 ../app/tools/gimpmeasuretool.c:605
+#: ../app/tools/gimpiscissorstool.c:914 ../app/tools/gimpmeasuretool.c:603
 msgid "Click-Drag to move this point"
 msgstr "クリック-ドラッグ: このポイントを移動します"
 
-#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpiscissorstool.c:967
+#: ../app/tools/gimpiscissorstool.c:916 ../app/tools/gimpiscissorstool.c:981
 #, c-format
 msgid "%s: disable auto-snap"
 msgstr "%s: 自動スナップを無効に"
 
-#: ../app/tools/gimpiscissorstool.c:919
+#: ../app/tools/gimpiscissorstool.c:933
 msgid "Click to close the curve"
 msgstr "クリック: カーブを閉じます"
 
-#: ../app/tools/gimpiscissorstool.c:925
+#: ../app/tools/gimpiscissorstool.c:939
 msgid "Click to add a point on this segment"
 msgstr "クリック: この線分上に新たなポイントを追加します"
 
-#: ../app/tools/gimpiscissorstool.c:939
+#: ../app/tools/gimpiscissorstool.c:953
 msgid "Click or press Enter to convert to a selection"
 msgstr "クリックまたは Enter/Return: 選択範囲に変換します"
 
-#: ../app/tools/gimpiscissorstool.c:949
+#: ../app/tools/gimpiscissorstool.c:963
 msgid "Press Enter to convert to a selection"
 msgstr "Enter/Return: 選択範囲に変換します"
 
-#: ../app/tools/gimpiscissorstool.c:964
+#: ../app/tools/gimpiscissorstool.c:978
 msgid "Click or Click-Drag to add a point"
 msgstr "クリックまたはクリック-ドラッグ: 新たなポイントを追加します"
 
-#: ../app/tools/gimplevelstool.c:142
+#: ../app/tools/gimplevelstool.c:137
 msgid "Levels Tool: Adjust color levels"
 msgstr ""
 "[レベル]\n"
 "色レベルを調整します"
 
-#: ../app/tools/gimplevelstool.c:143
+#: ../app/tools/gimplevelstool.c:138
 msgid "_Levels..."
 msgstr "レベル(_L)..."
 
-#: ../app/tools/gimplevelstool.c:162
+#: ../app/tools/gimplevelstool.c:157
 msgid "Import Levels"
 msgstr "レベル設定のインポート"
 
-#: ../app/tools/gimplevelstool.c:163
+#: ../app/tools/gimplevelstool.c:158
 msgid "Export Levels"
 msgstr "レベル設定のエクスポート"
 
-#: ../app/tools/gimplevelstool.c:264
+#: ../app/tools/gimplevelstool.c:275
 msgid "Pick black point"
 msgstr "黒点を設定"
 
-#: ../app/tools/gimplevelstool.c:268
+#: ../app/tools/gimplevelstool.c:279
 msgid "Pick gray point"
 msgstr "グレー点を設定"
 
-#: ../app/tools/gimplevelstool.c:272
+#: ../app/tools/gimplevelstool.c:283
 msgid "Pick white point"
 msgstr "白点を設定"
 
 #. Input levels frame
-#: ../app/tools/gimplevelstool.c:359
+#: ../app/tools/gimplevelstool.c:371
 msgid "Input Levels"
 msgstr "入力レベル"
 
-#: ../app/tools/gimplevelstool.c:462
+#: ../app/tools/gimplevelstool.c:450
 msgid "Gamma"
 msgstr "ガンマ"
 
 #. Output levels frame
-#: ../app/tools/gimplevelstool.c:504
+#: ../app/tools/gimplevelstool.c:485
 msgid "Output Levels"
 msgstr "出力レベル"
 
 #. all channels frame
-#: ../app/tools/gimplevelstool.c:581
+#: ../app/tools/gimplevelstool.c:543
 msgid "All Channels"
 msgstr "全チャンネル"
 
-#: ../app/tools/gimplevelstool.c:593 ../app/tools/gimpthresholdtool.c:239
+#: ../app/tools/gimplevelstool.c:555 ../app/tools/gimpthresholdtool.c:231
 msgid "_Auto"
 msgstr "自動調整(_A)"
 
-#: ../app/tools/gimplevelstool.c:595
+#: ../app/tools/gimplevelstool.c:557
 msgid "Adjust levels automatically"
 msgstr "レベルの自動調整"
 
-#: ../app/tools/gimplevelstool.c:618
+#: ../app/tools/gimplevelstool.c:580
 msgid "Edit these Settings as Curves"
 msgstr "この設定をトーンカーブで調整"
 
-#: ../app/tools/gimplevelstool.c:752
+#: ../app/tools/gimplevelstool.c:784
 msgid "Use _old levels file format"
 msgstr "旧レベルファイルフォーマットを使用する(_O)"
 
@@ -13632,44 +14761,40 @@ msgstr "ガイドを追加"
 msgid "Drag to create a line"
 msgstr "ドラッグ: 直線を引きます"
 
-#: ../app/tools/gimpmeasuretool.c:560
+#: ../app/tools/gimpmeasuretool.c:558
 msgid "Click to place vertical and horizontal guides"
 msgstr "クリック: 垂直方向・水平方向のガイドを配置します"
 
-#: ../app/tools/gimpmeasuretool.c:568
+#: ../app/tools/gimpmeasuretool.c:566
 msgid "Click to place a horizontal guide"
 msgstr "クリック: この位置に水平ガイドを置きます"
 
-#: ../app/tools/gimpmeasuretool.c:582
+#: ../app/tools/gimpmeasuretool.c:580
 msgid "Click to place a vertical guide"
 msgstr "クリック: この位置に垂直ガイドを置きます"
 
-#: ../app/tools/gimpmeasuretool.c:595
+#: ../app/tools/gimpmeasuretool.c:593
 msgid "Click-Drag to add a new point"
 msgstr "クリック-ドラッグ: 新たなポイントを追加します"
 
-#: ../app/tools/gimpmeasuretool.c:624
+#: ../app/tools/gimpmeasuretool.c:622
 msgid "Click-Drag to move all points"
 msgstr "クリック-ドラッグ: すべてのポイントを移動します"
 
-#: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084
-#: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168
-#: ../app/tools/gimppainttool.c:632
+#: ../app/tools/gimpmeasuretool.c:937 ../app/tools/gimpmeasuretool.c:1078
+#: ../app/tools/gimpmeasuretool.c:1134 ../app/tools/gimpmeasuretool.c:1162
+#: ../app/tools/gimppainttool.c:640
 msgid "pixels"
 msgstr "ピクセル"
 
-#: ../app/tools/gimpmeasuretool.c:1052
+#: ../app/tools/gimpmeasuretool.c:1046
 msgid "Measure Distances and Angles"
 msgstr "距離と角度の計測"
 
-#: ../app/tools/gimpmeasuretool.c:1073
+#: ../app/tools/gimpmeasuretool.c:1067
 msgid "Distance:"
 msgstr "距離:"
 
-#: ../app/tools/gimpmeasuretool.c:1101
-msgid "Angle:"
-msgstr "角度:"
-
 #: ../app/tools/gimpmoveoptions.c:140
 msgid "Pick a layer or guide"
 msgstr "つかんだレイヤーまたはガイドを移動"
@@ -13715,30 +14840,83 @@ msgstr ""
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../app/tools/gimpmovetool.c:249 ../app/tools/gimpmovetool.c:554
+#: ../app/tools/gimpmovetool.c:252 ../app/tools/gimpmovetool.c:612
 msgid "Move Guide: "
 msgstr "ガイドを移動: "
 
-#: ../app/tools/gimpmovetool.c:548
+#: ../app/tools/gimpmovetool.c:297
+#, fuzzy
+#| msgid "There is no path to transform."
+msgid "There is no path to move."
+msgstr "変形できるパスがありません。"
+
+#: ../app/tools/gimpmovetool.c:298 ../app/tools/gimptransformtool.c:1392
+#, fuzzy
+#| msgid "The active path is locked."
+msgid "The active path's position is locked."
+msgstr "アクティブなパスは保護されています。"
+
+#: ../app/tools/gimpmovetool.c:329
+#, fuzzy
+#| msgid "Feather selection by"
+msgid "The selection is empty."
+msgstr "縁をぼかす量"
+
+#: ../app/tools/gimpmovetool.c:337
+#, fuzzy
+#| msgid "There is no layer to transform."
+msgid "There is no layer to move."
+msgstr "変形できるレイヤーがありません。"
+
+#: ../app/tools/gimpmovetool.c:341 ../app/tools/gimpmovetool.c:367
+#, fuzzy
+#| msgid "The active layer's pixels are locked."
+msgid "The active layer's position is locked."
+msgstr "アクティブレイヤー中のすべてのピクセルが保護されています。"
+
+#: ../app/tools/gimpmovetool.c:354
+#, fuzzy
+#| msgid "The active path is locked."
+msgid "The active channel's position is locked."
+msgstr "アクティブなパスは保護されています。"
+
+#: ../app/tools/gimpmovetool.c:606
 msgid "Remove Guide"
 msgstr "ガイドを削除"
 
-#: ../app/tools/gimpmovetool.c:548
+#: ../app/tools/gimpmovetool.c:606
 msgid "Cancel Guide"
 msgstr "ガイド追加を取り消し"
 
-#: ../app/tools/gimpmovetool.c:554
+#: ../app/tools/gimpmovetool.c:612
 msgid "Add Guide: "
 msgstr "ガイドを追加: "
 
-#: ../app/tools/gimpoperationtool.c:101
+#: ../app/tools/gimpoperationtool.c:109
 #, fuzzy
+#| msgid "GEGL Tool: Use an arbitrary GEGL operation"
 msgid "Operation Tool: Use an arbitrary GEGL operation"
 msgstr ""
 "[GEGL 操作]\n"
 "任意の GEGL 操作を行い画像に変化を与えます。 GEGL 操作はインデックスレイヤー"
 "では利用できません。"
 
+#: ../app/tools/gimpoperationtool.c:311
+#, fuzzy, c-format
+#| msgid "Import Threshold Settings"
+msgid "Import '%s' Settings"
+msgstr "しきい値設定のインポート"
+
+#: ../app/tools/gimpoperationtool.c:312
+#, fuzzy, c-format
+#| msgid "Export Threshold Settings"
+msgid "Export '%s' Settings"
+msgstr "しきい値設定のエクスポート"
+
+#: ../app/tools/gimpoperationtool.c:549
+msgid "_Aux Input"
+msgstr ""
+
 #: ../app/tools/gimppaintbrushtool.c:52
 msgid "Paintbrush Tool: Paint smooth strokes using a brush"
 msgstr ""
@@ -13749,74 +14927,72 @@ msgstr ""
 msgid "_Paintbrush"
 msgstr "ブラシで描画(_P)"
 
-#: ../app/tools/gimppaintoptions-gui.c:92
-#: ../app/tools/gimpselectionoptions.c:218
-#: ../app/widgets/gimpbrushselect.c:191 ../app/widgets/gimplayertreeview.c:268
-msgid "Mode:"
-msgstr "モード:"
+#: ../app/tools/gimppaintoptions-gui.c:87
+msgid "Mode"
+msgstr "モード"
 
-#: ../app/tools/gimppaintoptions-gui.c:123
+#: ../app/tools/gimppaintoptions-gui.c:127
 msgid "Brush"
 msgstr "ブラシ"
 
-#: ../app/tools/gimppaintoptions-gui.c:153
+#: ../app/tools/gimppaintoptions-gui.c:157
 msgid "Reset size to brush's native size"
 msgstr "ブラシを本来のサイズに戻します"
 
-#: ../app/tools/gimppaintoptions-gui.c:160
+#: ../app/tools/gimppaintoptions-gui.c:164
 msgid "Aspect Ratio"
 msgstr "縦横比"
 
-#: ../app/tools/gimppaintoptions-gui.c:177
+#: ../app/tools/gimppaintoptions-gui.c:181
 msgid "Reset aspect ratio to brush's native"
 msgstr "ブラシを本来の縦横比に戻します"
 
-#: ../app/tools/gimppaintoptions-gui.c:201
+#: ../app/tools/gimppaintoptions-gui.c:205
 msgid "Reset angle to zero"
 msgstr "角度を 0 度に戻します"
 
-#: ../app/tools/gimppaintoptions-gui.c:239
+#: ../app/tools/gimppaintoptions-gui.c:243
 msgid "Incremental"
 msgstr "ストローク中の重ね塗り"
 
-#: ../app/tools/gimppaintoptions-gui.c:257
+#: ../app/tools/gimppaintoptions-gui.c:261
 msgid "Hard edge"
 msgstr "ハードエッジ"
 
-#: ../app/tools/gimppaintoptions-gui.c:286
+#: ../app/tools/gimppaintoptions-gui.c:289
 msgid "Dynamics Options"
 msgstr "動的特性のオプション"
 
-#: ../app/tools/gimppaintoptions-gui.c:292
+#: ../app/tools/gimppaintoptions-gui.c:295
 msgid "Fade Options"
 msgstr "フェードのオプション"
 
-#: ../app/tools/gimppaintoptions-gui.c:306
+#: ../app/tools/gimppaintoptions-gui.c:309
 msgid "Fade length"
 msgstr "フェードの長さ"
 
-#: ../app/tools/gimppaintoptions-gui.c:335
-#: ../app/widgets/gimpviewablebox.c:312
+#: ../app/tools/gimppaintoptions-gui.c:332
+#: ../app/widgets/gimpviewablebox.c:308
 msgid "Reverse"
 msgstr "反転"
 
-#: ../app/tools/gimppaintoptions-gui.c:342
+#: ../app/tools/gimppaintoptions-gui.c:339
 msgid "Color Options"
 msgstr "色のオプション"
 
-#: ../app/tools/gimppaintoptions-gui.c:368
+#: ../app/tools/gimppaintoptions-gui.c:365
 msgid "Amount"
 msgstr "散布量"
 
-#: ../app/tools/gimppaintoptions-gui.c:372
+#: ../app/tools/gimppaintoptions-gui.c:369
 msgid "Apply Jitter"
 msgstr "散布"
 
-#: ../app/tools/gimppaintoptions-gui.c:390
+#: ../app/tools/gimppaintoptions-gui.c:387
 msgid "Smooth stroke"
 msgstr "手ブレ補正"
 
-#: ../app/tools/gimppaintoptions-gui.c:400
+#: ../app/tools/gimppaintoptions-gui.c:397
 msgid "Weight"
 msgstr "ウエイト"
 
@@ -13833,11 +15009,11 @@ msgstr "クリック: 直線を引きます"
 msgid "%s to pick a color"
 msgstr "%s-クリック: ピクセルの色を描画色に設定"
 
-#: ../app/tools/gimppainttool.c:259
+#: ../app/tools/gimppainttool.c:258
 msgid "Cannot paint on layer groups."
 msgstr "グループレイヤーに直接描画することはできません。"
 
-#: ../app/tools/gimppainttool.c:678
+#: ../app/tools/gimppainttool.c:686
 #, c-format
 msgid "%s for a straight line"
 msgstr "%s-クリック: 直線を引く"
@@ -13864,49 +15040,51 @@ msgstr ""
 msgid "_Perspective Clone"
 msgstr "遠近スタンプで描画(_P)"
 
-#: ../app/tools/gimpperspectiveclonetool.c:675
+#: ../app/tools/gimpperspectiveclonetool.c:670
 msgid "Ctrl-Click to set a clone source"
 msgstr "Ctrl-クリック: スタンプソースを設定します"
 
-#: ../app/tools/gimpperspectivetool.c:83
+#: ../app/tools/gimpperspectivetool.c:84
 msgid "Perspective Tool: Change perspective of the layer, selection or path"
 msgstr ""
 "[遠近法]\n"
 "レイヤー、選択範囲、またはパスのいずれかにパース(遠近感)を与えます"
 
-#: ../app/tools/gimpperspectivetool.c:85
+#: ../app/tools/gimpperspectivetool.c:86
 msgid "_Perspective"
 msgstr "遠近法(_P)"
 
-#: ../app/tools/gimpperspectivetool.c:113
+#: ../app/tools/gimpperspectivetool.c:114
 msgid "Perspective transformation"
 msgstr "遠近法変形"
 
-#: ../app/tools/gimpperspectivetool.c:131
+#: ../app/tools/gimpperspectivetool.c:129
 msgid "Transformation Matrix"
 msgstr "変形情報行列"
 
-#: ../app/tools/gimpperspectivetool.c:256
+#: ../app/tools/gimpperspectivetool.c:254
 msgctxt "undo-type"
 msgid "Perspective"
 msgstr "遠近法"
 
-#: ../app/tools/gimpposterizetool.c:79
+#: ../app/tools/gimpposterizetool.c:60
 msgid "Posterize Tool: Reduce to a limited set of colors"
 msgstr ""
 "[ポスタリゼーション]\n"
 "画像の色数を減らしてポスター化します"
 
-#: ../app/tools/gimpposterizetool.c:80
+#: ../app/tools/gimpposterizetool.c:61
 msgid "_Posterize..."
 msgstr "ポスタリゼーション(_P)..."
 
-#: ../app/tools/gimpposterizetool.c:94
+#: ../app/tools/gimpposterizetool.c:72
 msgid "Posterize (Reduce Number of Colors)"
 msgstr "ポスタリゼーション (色数を減らす)"
 
-#: ../app/tools/gimpposterizetool.c:182
-msgid "Posterize _levels:"
+#: ../app/tools/gimpposterizetool.c:110
+#, fuzzy
+#| msgid "Posterize _levels:"
+msgid "Posterize _levels"
 msgstr "ポスタリゼーションのレベル(_L):"
 
 #: ../app/tools/gimprectangleoptions.c:105
@@ -13921,7 +15099,7 @@ msgstr ""
 "ヤーのみを対象にします。"
 
 #: ../app/tools/gimprectangleoptions.c:123
-#: ../app/tools/gimptransformoptions.c:128
+#: ../app/tools/gimptransformoptions.c:138
 msgid "Composition guides such as rule of thirds"
 msgstr "選択範囲作成時に [三分割法] などの構図ガイドを表示します"
 
@@ -13985,29 +15163,32 @@ msgstr "現在の縦横比"
 msgid "Expand from center"
 msgstr "中央から拡げる"
 
-#: ../app/tools/gimprectangleoptions.c:863
-msgid "Fixed:"
-msgstr "値を固定"
+#: ../app/tools/gimprectangleoptions.c:871
+#, fuzzy
+#| msgctxt "source-align-mode"
+#| msgid "Fixed"
+msgid "Fixed"
+msgstr "固定"
 
 # ツールオプションダイアログで、矩形選択などの左上座標を示す(または入力)するテキストボックスのラベル
-#: ../app/tools/gimprectangleoptions.c:1011
+#: ../app/tools/gimprectangleoptions.c:1012
 msgid "Position:"
 msgstr "左上角の座標:"
 
-#: ../app/tools/gimprectangleoptions.c:1021 ../app/tools/gimptextoptions.c:526
+#: ../app/tools/gimprectangleoptions.c:1022 ../app/tools/gimptextoptions.c:526
 msgid "Size:"
 msgstr "サイズ:"
 
-#: ../app/tools/gimprectangleoptions.c:1029
+#: ../app/tools/gimprectangleoptions.c:1030
 msgid "Highlight"
 msgstr "ハイライト表示"
 
 #. Auto Shrink
-#: ../app/tools/gimprectangleoptions.c:1041
+#: ../app/tools/gimprectangleoptions.c:1042
 msgid "Auto Shrink"
 msgstr "選択範囲の自動縮小"
 
-#: ../app/tools/gimprectangleoptions.c:1051
+#: ../app/tools/gimprectangleoptions.c:1052
 msgid "Shrink merged"
 msgstr "すべての可視レイヤーを対象にする"
 
@@ -14055,29 +15236,31 @@ msgstr ""
 msgid "Selection criterion"
 msgstr "選択範囲判定時の基準とする要素を指定します"
 
-#: ../app/tools/gimpregionselectoptions.c:205
+#: ../app/tools/gimpregionselectoptions.c:203
 msgid "Select transparent areas"
 msgstr "透明部分も選択可"
 
-#: ../app/tools/gimpregionselectoptions.c:227
-msgid "Select by:"
+#: ../app/tools/gimpregionselectoptions.c:222
+#, fuzzy
+#| msgid "Select by:"
+msgid "Select by"
 msgstr "判定基準:"
 
 #: ../app/tools/gimpregionselecttool.c:163
 msgid "Move the mouse to change threshold"
 msgstr "マウスを移動させると、しきい値が変化します"
 
-#: ../app/tools/gimprotatetool.c:93
+#: ../app/tools/gimprotatetool.c:94
 msgid "Rotate"
 msgstr "回転"
 
-#: ../app/tools/gimprotatetool.c:94
+#: ../app/tools/gimprotatetool.c:95
 msgid "Rotate Tool: Rotate the layer, selection or path"
 msgstr ""
 "[回転]\n"
 "レイヤー、選択範囲、またはパスを回転します"
 
-#: ../app/tools/gimprotatetool.c:95
+#: ../app/tools/gimprotatetool.c:96
 msgid "_Rotate"
 msgstr "回転(_R)"
 
@@ -14093,23 +15276,23 @@ msgstr "中心の x 座標 (_X):"
 msgid "Center _Y:"
 msgstr "中心の y 座標 (_Y):"
 
-#: ../app/tools/gimprotatetool.c:373
+#: ../app/tools/gimprotatetool.c:374
 #, c-format
 msgctxt "undo-type"
 msgid "Rotate by %-3.3g° around (%g, %g)"
 msgstr "回転 (角度: %-3.3g°中心座標: %g, %g)"
 
-#: ../app/tools/gimpscaletool.c:89
+#: ../app/tools/gimpscaletool.c:90
 msgid "Scale"
 msgstr "拡大・縮小"
 
-#: ../app/tools/gimpscaletool.c:90
+#: ../app/tools/gimpscaletool.c:91
 msgid "Scale Tool: Scale the layer, selection or path"
 msgstr ""
 "[拡大・縮小]\n"
 "レイヤー、選択範囲、パスのいずれかの拡大または縮小を行います"
 
-#: ../app/tools/gimpscaletool.c:91
+#: ../app/tools/gimpscaletool.c:92
 msgid "_Scale"
 msgstr "拡大・縮小(_S)"
 
@@ -14119,6 +15302,26 @@ msgctxt "undo-type"
 msgid "Scale to %d x %d"
 msgstr "%d x %d に拡大・縮小"
 
+#: ../app/tools/gimpseamlesscloneoptions.c:126
+#, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Item properties"
+msgid "Temp property"
+msgstr "アイテムのプロパティ"
+
+#: ../app/tools/gimpseamlessclonetool.c:182
+#: ../app/tools/gimpseamlessclonetool.c:692
+msgid "Seamless Clone"
+msgstr ""
+
+#: ../app/tools/gimpseamlessclonetool.c:183
+msgid "Seamless Clone: Seamlessly paste one image into another"
+msgstr ""
+
+#: ../app/tools/gimpseamlessclonetool.c:184
+msgid "_Seamless Clone"
+msgstr ""
+
 #: ../app/tools/gimpselectionoptions.c:85
 msgid "Enable feathering of selection edges"
 msgstr "この設定をオンにすると、選択範囲の境界をぼかします"
@@ -14127,6 +15330,11 @@ msgstr "この設定をオンにすると、選択範囲の境界をぼかしま
 msgid "Radius of feathering"
 msgstr "ぼかし半径を設定します"
 
+#: ../app/tools/gimpselectionoptions.c:218
+#: ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:270
+msgid "Mode:"
+msgstr "モード:"
+
 #: ../app/tools/gimpselectionoptions.c:265 ../app/tools/gimptextoptions.c:539
 msgid "Antialiasing"
 msgstr "なめらかに"
@@ -14135,78 +15343,78 @@ msgstr "なめらかに"
 msgid "Feather edges"
 msgstr "境界をぼかす"
 
-#: ../app/tools/gimpselectiontool.c:250
+#: ../app/tools/gimpselectiontool.c:255
 msgid "Click-Drag to replace the current selection"
 msgstr "クリック-ドラッグ: 選択範囲を置き換えます"
 
-#: ../app/tools/gimpselectiontool.c:258
+#: ../app/tools/gimpselectiontool.c:263
 msgid "Click-Drag to create a new selection"
 msgstr "クリック-ドラッグ: 選択範囲を作成します"
 
-#: ../app/tools/gimpselectiontool.c:263
+#: ../app/tools/gimpselectiontool.c:268
 msgid "Click-Drag to add to the current selection"
 msgstr "クリック-ドラッグ: 作成した範囲を選択範囲に加えます"
 
-#: ../app/tools/gimpselectiontool.c:272
+#: ../app/tools/gimpselectiontool.c:277
 msgid "Click-Drag to subtract from the current selection"
 msgstr "クリック-ドラッグ: 作成した範囲を選択範囲から引きます"
 
-#: ../app/tools/gimpselectiontool.c:281
+#: ../app/tools/gimpselectiontool.c:286
 msgid "Click-Drag to intersect with the current selection"
 msgstr "クリック-ドラッグ: 既存の選択範囲との交差部分を新しい選択範囲にします"
 
-#: ../app/tools/gimpselectiontool.c:291
+#: ../app/tools/gimpselectiontool.c:296
 msgid "Click-Drag to move the selection mask"
 msgstr "クリック-ドラッグ: 選択マスクを移動します"
 
-#: ../app/tools/gimpselectiontool.c:299
+#: ../app/tools/gimpselectiontool.c:304
 msgid "Click-Drag to move the selected pixels"
 msgstr "クリック-ドラッグ: 選択範囲中のピクセルを移動します"
 
-#: ../app/tools/gimpselectiontool.c:303
+#: ../app/tools/gimpselectiontool.c:308
 msgid "Click-Drag to move a copy of the selected pixels"
 msgstr "クリック-ドラッグ: 選択範囲中のピクセルのコピーを移動します"
 
-#: ../app/tools/gimpselectiontool.c:307
+#: ../app/tools/gimpselectiontool.c:312
 msgid "Click to anchor the floating selection"
 msgstr "クリック: フローティング選択範囲を固定します"
 
-#: ../app/tools/gimpsheartool.c:84
+#: ../app/tools/gimpsheartool.c:86
 msgid "Shear"
 msgstr "剪断変形"
 
-#: ../app/tools/gimpsheartool.c:85
+#: ../app/tools/gimpsheartool.c:87
 msgid "Shear Tool: Shear the layer, selection or path"
 msgstr ""
 "[剪断変形]\n"
 "レイヤー、選択範囲、またはパスを剪断変形します"
 
-#: ../app/tools/gimpsheartool.c:86
+#: ../app/tools/gimpsheartool.c:88
 msgid "S_hear"
 msgstr "剪断変形(_H)"
 
-#: ../app/tools/gimpsheartool.c:136
+#: ../app/tools/gimpsheartool.c:137
 msgid "Shear magnitude _X:"
 msgstr "変形率(_X):"
 
-#: ../app/tools/gimpsheartool.c:146
+#: ../app/tools/gimpsheartool.c:147
 msgid "Shear magnitude _Y:"
 msgstr "変形率(_Y):"
 
-#: ../app/tools/gimpsheartool.c:256
+#: ../app/tools/gimpsheartool.c:257
 #, c-format
 msgctxt "undo-type"
 msgid "Shear horizontally by %-3.3g"
 msgstr "剪断変形 (水平方向の変形率: %-3.3g)"
 
-#: ../app/tools/gimpsheartool.c:260
+#: ../app/tools/gimpsheartool.c:261
 #, c-format
 msgctxt "undo-type"
 msgid "Shear vertically by %-3.3g"
 msgstr "剪断変形 (垂直方向の変形率: %-3.3g)"
 
 #. e.g. user entered numbers but no notification callback
-#: ../app/tools/gimpsheartool.c:265
+#: ../app/tools/gimpsheartool.c:266
 #, c-format
 msgctxt "undo-type"
 msgid "Shear horizontally by %-3.3g, vertically by %-3.3g"
@@ -14230,6 +15438,13 @@ msgstr "クリック: にじませます"
 msgid "Click to smudge the line"
 msgstr "クリック: 直線をにじませます"
 
+#: ../app/tools/gimpsmudgetool.c:92
+#, fuzzy
+#| msgid "Rate"
+msgctxt "smudge-tool"
+msgid "Rate"
+msgstr "割合"
+
 #: ../app/tools/gimptextoptions.c:132
 msgid "Font size unit"
 msgstr "フォントサイズの単位を指定します"
@@ -14247,7 +15462,7 @@ msgstr ""
 
 #: ../app/tools/gimptextoptions.c:154
 msgid "The text language may have an effect on the way the text is rendered."
-msgstr "ここで設定された言語はテキスト描画時に影響を与えるかもしれません"
+msgstr "ここで設定された言語はテキスト描画時に影響を与える可能性があります。"
 
 #: ../app/tools/gimptextoptions.c:165
 msgid "Text alignment"
@@ -14351,41 +15566,41 @@ msgstr ""
 "このレイヤーを編集することも、文字アトリビュートを用いて新しいテキストレイ"
 "ヤーを生成することもできます。"
 
-#: ../app/tools/gimptexttool-editor.c:1172
+#: ../app/tools/gimptexttool-editor.c:1199
 msgid "GIMP Text Editor"
 msgstr "GIMP テキストエディター"
 
-#: ../app/tools/gimpthresholdtool.c:88
+#: ../app/tools/gimpthresholdtool.c:89
 msgid "Threshold Tool: Reduce image to two colors using a threshold"
 msgstr ""
 "[しきい値]\n"
 "しきい値で 2 階調の画像へ変換します"
 
-#: ../app/tools/gimpthresholdtool.c:89
+#: ../app/tools/gimpthresholdtool.c:90
 msgid "_Threshold..."
 msgstr "しきい値(_T)..."
 
-#: ../app/tools/gimpthresholdtool.c:106
+#: ../app/tools/gimpthresholdtool.c:107
 msgid "Apply Threshold"
 msgstr "しきい値を適用"
 
-#: ../app/tools/gimpthresholdtool.c:108
+#: ../app/tools/gimpthresholdtool.c:109
 msgid "Import Threshold Settings"
 msgstr "しきい値設定のインポート"
 
-#: ../app/tools/gimpthresholdtool.c:109
+#: ../app/tools/gimpthresholdtool.c:110
 msgid "Export Threshold Settings"
 msgstr "しきい値設定のエクスポート"
 
-#: ../app/tools/gimpthresholdtool.c:241
+#: ../app/tools/gimpthresholdtool.c:233
 msgid "Automatically adjust to optimal binarization threshold"
 msgstr "画像から最適なしいき値を計算します"
 
-#: ../app/tools/gimptool.c:978
+#: ../app/tools/gimptool.c:1028
 msgid "Can't work on an empty image, add a layer first"
 msgstr "空の画像では作業できません。まずレイヤーを追加してください。"
 
-#: ../app/tools/gimp-tools.c:353
+#: ../app/tools/gimp-tools.c:361
 msgid ""
 "This tool has\n"
 "no options."
@@ -14393,27 +15608,27 @@ msgstr ""
 "このツールには\n"
 "オプションはありません"
 
-#: ../app/tools/gimptransformoptions.c:100
+#: ../app/tools/gimptransformoptions.c:110
 msgid "Direction of transformation"
 msgstr "変形の方向を指定します"
 
-#: ../app/tools/gimptransformoptions.c:106
+#: ../app/tools/gimptransformoptions.c:116
 msgid "Interpolation method"
 msgstr "補間アルゴリズムを指定します"
 
-#: ../app/tools/gimptransformoptions.c:112
+#: ../app/tools/gimptransformoptions.c:122
 msgid "How to clip"
 msgstr "クリッピング方法を指定します"
 
-#: ../app/tools/gimptransformoptions.c:118
+#: ../app/tools/gimptransformoptions.c:128
 msgid "Show a preview of the transformed image"
 msgstr "変形画像のプレビューを表示します"
 
-#: ../app/tools/gimptransformoptions.c:123
+#: ../app/tools/gimptransformoptions.c:133
 msgid "Opacity of the preview image"
 msgstr "プレビュー画像の不透明度を指定します"
 
-#: ../app/tools/gimptransformoptions.c:134
+#: ../app/tools/gimptransformoptions.c:144
 msgid "Size of a grid cell for variable number of composition guides"
 msgstr ""
 "[ガイド] を [グリッド線の数を指定] または [グリッド間隔を指定] に設定している"
@@ -14422,73 +15637,126 @@ msgstr ""
 "[グリッド間隔を指定] のときは、値はピクセル単位のグリッド間隔を意味しますが、"
 "実際の間隔は各グリッドセル間で均一になるように調整されます"
 
-#: ../app/tools/gimptransformoptions.c:278
+#: ../app/tools/gimptransformoptions.c:387
 msgid "Transform:"
 msgstr "変形対象:"
 
-#: ../app/tools/gimptransformoptions.c:287
+#: ../app/tools/gimptransformoptions.c:396
 #: ../app/widgets/gimpdynamicseditor.c:144
 #: ../app/widgets/gimpdynamicsoutputeditor.c:72
 msgid "Direction"
 msgstr "方向"
 
-#. the interpolation menu
-#: ../app/tools/gimptransformoptions.c:292
-msgid "Interpolation:"
+#: ../app/tools/gimptransformoptions.c:402
+#, fuzzy
+#| msgid "Interpolation:"
+msgid "Interpolation"
 msgstr "補間アルゴリズム:"
 
-#. the clipping menu
-#: ../app/tools/gimptransformoptions.c:301
-msgid "Clipping:"
+#: ../app/tools/gimptransformoptions.c:409
+#, fuzzy
+#| msgid "Clipping:"
+msgid "Clipping"
 msgstr "クリッピング:"
 
-#: ../app/tools/gimptransformoptions.c:311
+#: ../app/tools/gimptransformoptions.c:416
 msgid "Image opacity"
 msgstr "プレビューの不透明度"
 
-#: ../app/tools/gimptransformoptions.c:313
+#: ../app/tools/gimptransformoptions.c:420
 msgid "Show image preview"
 msgstr "プレビューを表示"
 
-#. the guides frame
-#: ../app/tools/gimptransformoptions.c:319
+#: ../app/tools/gimptransformoptions.c:432
 msgid "Guides"
 msgstr "ガイド"
 
-#: ../app/tools/gimptransformoptions.c:347
+#: ../app/tools/gimptransformoptions.c:452
 #, c-format
 msgid "15 degrees  (%s)"
 msgstr "15 度ずつ回転  (%s)"
 
-#: ../app/tools/gimptransformoptions.c:348
+#: ../app/tools/gimptransformoptions.c:453
 msgid "Limit rotation steps to 15 degrees"
 msgstr "回転角度を 15 度刻みにします"
 
-#: ../app/tools/gimptransformoptions.c:352
+#: ../app/tools/gimptransformoptions.c:458
 #, c-format
 msgid "Keep aspect  (%s)"
 msgstr "縦横比を維持  (%s)"
 
-#: ../app/tools/gimptransformoptions.c:353
+#: ../app/tools/gimptransformoptions.c:459
 msgid "Keep the original aspect ratio"
 msgstr "元の縦横比を維持して変形します"
 
-#: ../app/tools/gimptransformtool.c:210
+#: ../app/tools/gimptransformtool.c:236
 msgid "Transforming"
 msgstr "変形しています"
 
-#: ../app/tools/gimptransformtool.c:1063
+#: ../app/tools/gimptransformtool.c:279 ../app/tools/gimptransformtool.c:1371
+#, fuzzy
+#| msgid "The active layer's pixels are locked."
+msgid "The active layer's position and size are locked."
+msgstr "アクティブレイヤー中のすべてのピクセルが保護されています。"
+
+#: ../app/tools/gimptransformtool.c:801 ../app/tools/gimptransformtool.c:814
+#, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Transform Items"
+msgid "Transform Step"
+msgstr "アイテムの変形"
+
+#: ../app/tools/gimptransformtool.c:1366
 msgid "There is no layer to transform."
 msgstr "変形できるレイヤーがありません。"
 
-#: ../app/tools/gimptransformtool.c:1076
+#: ../app/tools/gimptransformtool.c:1387
 msgid "There is no path to transform."
 msgstr "変形できるパスがありません。"
 
-#: ../app/tools/gimptransformtool.c:1077
+#: ../app/tools/gimptransformtool.c:1390
 msgid "The active path's strokes are locked."
 msgstr "アクティブなパスの境界線は保護されています。"
 
+#: ../app/tools/gimpunifiedtransformtool.c:104
+#, fuzzy
+#| msgid "Cage Transform"
+msgid "Unified Transform"
+msgstr "ケージ変形"
+
+#: ../app/tools/gimpunifiedtransformtool.c:105
+#, fuzzy
+#| msgid "Shear Tool: Shear the layer, selection or path"
+msgid "Unified Transform Tool: Transform the layer, selection or path"
+msgstr ""
+"[剪断変形]\n"
+"レイヤー、選択範囲、またはパスを剪断変形します"
+
+#: ../app/tools/gimpunifiedtransformtool.c:107
+#, fuzzy
+#| msgid "_Cage Transform"
+msgid "_Unified Transform"
+msgstr "ケージ変形(_C)"
+
+#: ../app/tools/gimpunifiedtransformtool.c:134
+#, fuzzy
+#| msgid "Cage transform"
+msgid "Unified transform"
+msgstr "ケージ変形"
+
+#: ../app/tools/gimpunifiedtransformtool.c:745
+#, fuzzy
+#| msgid "Transformation Matrix"
+msgid "Transform Matrix"
+msgstr "変形情報行列"
+
+#: ../app/tools/gimpunifiedtransformtool.c:1288
+#, fuzzy
+#| msgid "Cage Transform"
+msgctxt "undo-type"
+msgid "Unified Transform"
+msgstr "ケージ変形"
+
 #: ../app/tools/gimpvectoroptions.c:77
 msgid "Restrict editing to polygons"
 msgstr "編集を多角形に制限"
@@ -14529,139 +15797,189 @@ msgstr ""
 msgid "Pat_hs"
 msgstr "パス(_H)"
 
-#: ../app/tools/gimpvectortool.c:250
+#: ../app/tools/gimpvectortool.c:251
 msgid "The active path is locked."
 msgstr "アクティブなパスは保護されています。"
 
-#: ../app/tools/gimpvectortool.c:340
+#: ../app/tools/gimpvectortool.c:341
 msgid "Add Stroke"
 msgstr "ストロークの追加"
 
-#: ../app/tools/gimpvectortool.c:365
+#: ../app/tools/gimpvectortool.c:366
 msgid "Add Anchor"
 msgstr "アンカーの追加"
 
-#: ../app/tools/gimpvectortool.c:391
+#: ../app/tools/gimpvectortool.c:392
 msgid "Insert Anchor"
 msgstr "アンカーの挿入"
 
-#: ../app/tools/gimpvectortool.c:422
+#: ../app/tools/gimpvectortool.c:423
 msgid "Drag Handle"
 msgstr "ハンドルのドラッグ"
 
-#: ../app/tools/gimpvectortool.c:453
+#: ../app/tools/gimpvectortool.c:454
 msgid "Drag Anchor"
 msgstr "アンカーのドラッグ"
 
-#: ../app/tools/gimpvectortool.c:471
+#: ../app/tools/gimpvectortool.c:472
 msgid "Drag Anchors"
 msgstr "アンカーのドラッグ"
 
-#: ../app/tools/gimpvectortool.c:494
+#: ../app/tools/gimpvectortool.c:495
 msgid "Drag Curve"
 msgstr "カーブのドラッグ"
 
-#: ../app/tools/gimpvectortool.c:523
+#: ../app/tools/gimpvectortool.c:524
 msgid "Connect Strokes"
 msgstr "ストロークの接続"
 
-#: ../app/tools/gimpvectortool.c:555
+#: ../app/tools/gimpvectortool.c:556
 msgid "Drag Path"
 msgstr "パスのドラッグ"
 
-#: ../app/tools/gimpvectortool.c:566
+#: ../app/tools/gimpvectortool.c:567
 msgid "Convert Edge"
 msgstr "辺の変換"
 
-#: ../app/tools/gimpvectortool.c:597
+#: ../app/tools/gimpvectortool.c:598
 msgid "Delete Anchor"
 msgstr "アンカーの削除"
 
-#: ../app/tools/gimpvectortool.c:620
+#: ../app/tools/gimpvectortool.c:621
 msgid "Delete Segment"
 msgstr "セグメントの削除"
 
-#: ../app/tools/gimpvectortool.c:842
+#: ../app/tools/gimpvectortool.c:843
 msgid "Move Anchors"
 msgstr "アンカーの移動"
 
-#: ../app/tools/gimpvectortool.c:1205
+#: ../app/tools/gimpvectortool.c:1206
 msgid "Click to pick path to edit"
 msgstr "クリック: パスを編集します"
 
-#: ../app/tools/gimpvectortool.c:1209
+#: ../app/tools/gimpvectortool.c:1210
 msgid "Click to create a new path"
 msgstr "クリック: 新しいパスを作成します"
 
-#: ../app/tools/gimpvectortool.c:1213
+#: ../app/tools/gimpvectortool.c:1214
 msgid "Click to create a new component of the path"
 msgstr "クリック: パスの新しいコンポーネントを作成します"
 
-#: ../app/tools/gimpvectortool.c:1217
+#: ../app/tools/gimpvectortool.c:1218
 msgid "Click or Click-Drag to create a new anchor"
 msgstr "クリック-ドラッグ: 新しいアンカーを作成します"
 
-#: ../app/tools/gimpvectortool.c:1229 ../app/tools/gimpvectortool.c:1236
+#: ../app/tools/gimpvectortool.c:1230 ../app/tools/gimpvectortool.c:1237
 msgid "Click-Drag to move the anchor around"
 msgstr "クリック-ドラッグ: アンカーを移動します"
 
-#: ../app/tools/gimpvectortool.c:1240 ../app/tools/gimpvectortool.c:1263
+#: ../app/tools/gimpvectortool.c:1241 ../app/tools/gimpvectortool.c:1264
 msgid "Click-Drag to move the anchors around"
 msgstr "クリック-ドラッグ: アンカーを移動します"
 
-#: ../app/tools/gimpvectortool.c:1246
+#: ../app/tools/gimpvectortool.c:1247
 msgid "Click-Drag to move the handle around"
 msgstr "クリック-ドラッグ: ハンドルを移動します"
 
-#: ../app/tools/gimpvectortool.c:1253
+#: ../app/tools/gimpvectortool.c:1254
 msgid "Click-Drag to move the handles around symmetrically"
 msgstr "クリック-ドラッグ: 両ハンドルを対称的に移動します"
 
-#: ../app/tools/gimpvectortool.c:1268
+#: ../app/tools/gimpvectortool.c:1269
 msgid "Click-Drag to change the shape of the curve"
 msgstr "クリック-ドラッグ: カーブの形状を変えます"
 
-#: ../app/tools/gimpvectortool.c:1271
+#: ../app/tools/gimpvectortool.c:1272
 #, c-format
 msgid "%s: symmetrical"
 msgstr "%s: 対称に"
 
-#: ../app/tools/gimpvectortool.c:1276
+#: ../app/tools/gimpvectortool.c:1277
 msgid "Click-Drag to move the component around"
 msgstr "クリック-ドラッグ: コンポーネントを移動します"
 
-#: ../app/tools/gimpvectortool.c:1284
+#: ../app/tools/gimpvectortool.c:1285
 msgid "Click-Drag to move the path around"
 msgstr "クリック-ドラッグ: パスを移動します"
 
-#: ../app/tools/gimpvectortool.c:1288
+#: ../app/tools/gimpvectortool.c:1289
 msgid "Click-Drag to insert an anchor on the path"
 msgstr "クリック: アンカーをパス上に挿入します"
 
-#: ../app/tools/gimpvectortool.c:1296
+#: ../app/tools/gimpvectortool.c:1297
 msgid "Click to delete this anchor"
 msgstr "クリック: このアンカーを削除します"
 
-#: ../app/tools/gimpvectortool.c:1300
+#: ../app/tools/gimpvectortool.c:1301
 msgid "Click to connect this anchor with the selected endpoint"
 msgstr "クリック: このアンカーと選択した端点を接続します"
 
-#: ../app/tools/gimpvectortool.c:1305
+#: ../app/tools/gimpvectortool.c:1306
 msgid "Click to open up the path"
 msgstr "クリック: パスを開きます"
 
-#: ../app/tools/gimpvectortool.c:1309
+#: ../app/tools/gimpvectortool.c:1310
 msgid "Click to make this node angular"
 msgstr "クリック: このノードを角にします"
 
-#: ../app/tools/gimpvectortool.c:1810
+#: ../app/tools/gimpvectortool.c:1811
 msgid "Delete Anchors"
 msgstr "アンカーの削除"
 
-#: ../app/tools/gimpvectortool.c:1969
+#: ../app/tools/gimpvectortool.c:1970
 msgid "There is no active layer or channel to stroke to"
 msgstr "ストロークするためのアクティブレイヤーやアクティブパスがありません"
 
+#: ../app/tools/gimpwarpoptions.c:81
+msgid "Effect Strength"
+msgstr ""
+
+#: ../app/tools/gimpwarpoptions.c:86
+msgid "Effect Size"
+msgstr ""
+
+#: ../app/tools/gimpwarpoptions.c:91
+#, fuzzy
+#| msgid "Hardness"
+msgid "Effect Hardness"
+msgstr "硬さ"
+
+#: ../app/tools/gimpwarpoptions.c:173
+#, fuzzy
+#| msgid "Length"
+msgid "Strength"
+msgstr "長さ"
+
+#: ../app/tools/gimpwarpoptions.c:187 ../app/widgets/gimpbrusheditor.c:178
+msgid "Hardness"
+msgstr "硬さ"
+
+#: ../app/tools/gimpwarptool.c:129
+#, fuzzy
+#| msgid "Cage Transform"
+msgid "Warp Transform"
+msgstr "ケージ変形"
+
+#: ../app/tools/gimpwarptool.c:130
+msgid "Warp Transform: Deform with different tools"
+msgstr ""
+
+#: ../app/tools/gimpwarptool.c:131
+#, fuzzy
+#| msgid "_Cage Transform"
+msgid "_Warp Transform"
+msgstr "ケージ変形(_C)"
+
+#: ../app/tools/gimpwarptool.c:439 ../app/tools/gimpwarptool.c:451
+msgid "Warp Tool Stroke"
+msgstr ""
+
+#: ../app/tools/gimpwarptool.c:655
+#, fuzzy
+#| msgid "Cage transform"
+msgid "Warp transform"
+msgstr "ケージ変形"
+
 #: ../app/tools/tools-enums.c:150
 msgctxt "rectangle-tool-fixed-rule"
 msgid "Aspect ratio"
@@ -14727,202 +16045,293 @@ msgctxt "vector-mode"
 msgid "Move"
 msgstr "移動"
 
-#: ../app/vectors/gimpvectors.c:209
+#: ../app/tools/tools-enums.c:306
+#, fuzzy
+#| msgid "Mark foreground"
+msgctxt "matting-draw-mode"
+msgid "Draw foreground"
+msgstr "前景部分をマーク"
+
+#: ../app/tools/tools-enums.c:307
+#, fuzzy
+#| msgid "Mark background"
+msgctxt "matting-draw-mode"
+msgid "Draw background"
+msgstr "背景部分をマーク"
+
+#: ../app/tools/tools-enums.c:308
+#, fuzzy
+#| msgctxt "orientation-type"
+#| msgid "Unknown"
+msgctxt "matting-draw-mode"
+msgid "Draw unknown"
+msgstr "不明"
+
+#: ../app/tools/tools-enums.c:336
+msgctxt "matting-engine"
+msgid "Matting Global"
+msgstr ""
+
+#: ../app/tools/tools-enums.c:337
+msgctxt "matting-engine"
+msgid "Matting Levin"
+msgstr ""
+
+#: ../app/tools/tools-enums.c:370
+#, fuzzy
+#| msgid "Lock pixels"
+msgctxt "warp-behavior"
+msgid "Move pixels"
+msgstr "すべてのピクセルを保護"
+
+#: ../app/tools/tools-enums.c:371
+#, fuzzy
+#| msgctxt "undo-type"
+#| msgid "Grow Channel"
+msgctxt "warp-behavior"
+msgid "Grow area"
+msgstr "チャンネルの拡大"
+
+#: ../app/tools/tools-enums.c:372
+#, fuzzy
+#| msgctxt "view-action"
+#| msgid "Shrink _Wrap"
+msgctxt "warp-behavior"
+msgid "Shrink area"
+msgstr "ウィンドウサイズを合わせる(_W)"
+
+#: ../app/tools/tools-enums.c:373
+#, fuzzy
+#| msgctxt "gradient-editor-coloring"
+#| msgid "HSV (clockwise _hue)"
+msgctxt "warp-behavior"
+msgid "Swirl clockwise"
+msgstr "HSV (色相時計回り)(_H)"
+
+#: ../app/tools/tools-enums.c:374
+#, fuzzy
+#| msgctxt "gradient-editor-coloring"
+#| msgid "HSV (_counter-clockwise hue)"
+msgctxt "warp-behavior"
+msgid "Swirl counter-clockwise"
+msgstr "HSV (色相反時計回り)(_C)"
+
+#: ../app/tools/tools-enums.c:375
+#, fuzzy
+#| msgid "Eraser"
+msgctxt "warp-behavior"
+msgid "Erase warping"
+msgstr "消しゴム"
+
+#: ../app/tools/tools-enums.c:376
+#, fuzzy
+#| msgid "Smoothing:"
+msgctxt "warp-behavior"
+msgid "Smooth warping"
+msgstr "スムージング:"
+
+#: ../app/vectors/gimpvectors.c:208
 msgctxt "undo-type"
 msgid "Rename Path"
 msgstr "パス名の変更"
 
-#: ../app/vectors/gimpvectors.c:210
+#: ../app/vectors/gimpvectors.c:209
 msgctxt "undo-type"
 msgid "Move Path"
 msgstr "パスの移動"
 
-#: ../app/vectors/gimpvectors.c:211
+#: ../app/vectors/gimpvectors.c:210
 msgctxt "undo-type"
 msgid "Scale Path"
 msgstr "パスの拡大・縮小"
 
-#: ../app/vectors/gimpvectors.c:212
+#: ../app/vectors/gimpvectors.c:211
 msgctxt "undo-type"
 msgid "Resize Path"
 msgstr "パスのサイズ変更"
 
-#: ../app/vectors/gimpvectors.c:213
+#: ../app/vectors/gimpvectors.c:212
 msgctxt "undo-type"
 msgid "Flip Path"
 msgstr "パスの鏡像反転"
 
-#: ../app/vectors/gimpvectors.c:214
+#: ../app/vectors/gimpvectors.c:213
 msgctxt "undo-type"
 msgid "Rotate Path"
 msgstr "パスの回転"
 
-#: ../app/vectors/gimpvectors.c:215
+#: ../app/vectors/gimpvectors.c:214
 msgctxt "undo-type"
 msgid "Transform Path"
 msgstr "パスの変形"
 
-#: ../app/vectors/gimpvectors.c:216
+#: ../app/vectors/gimpvectors.c:215
 msgctxt "undo-type"
 msgid "Stroke Path"
 msgstr "パスの境界線を描画"
 
-#: ../app/vectors/gimpvectors.c:217
+#: ../app/vectors/gimpvectors.c:216
 msgctxt "undo-type"
 msgid "Path to Selection"
 msgstr "パスを選択範囲に"
 
-#: ../app/vectors/gimpvectors.c:218
+#: ../app/vectors/gimpvectors.c:217
 msgctxt "undo-type"
 msgid "Reorder Path"
 msgstr "パスの並べ替え"
 
-#: ../app/vectors/gimpvectors.c:219
+#: ../app/vectors/gimpvectors.c:218
 msgctxt "undo-type"
 msgid "Raise Path"
 msgstr "パスを前面へ"
 
-#: ../app/vectors/gimpvectors.c:220
+#: ../app/vectors/gimpvectors.c:219
 msgctxt "undo-type"
 msgid "Raise Path to Top"
 msgstr "パスを最前面へ"
 
-#: ../app/vectors/gimpvectors.c:221
+#: ../app/vectors/gimpvectors.c:220
 msgctxt "undo-type"
 msgid "Lower Path"
 msgstr "パスを背面へ"
 
-#: ../app/vectors/gimpvectors.c:222
+#: ../app/vectors/gimpvectors.c:221
 msgctxt "undo-type"
 msgid "Lower Path to Bottom"
 msgstr "パスを最背面へ"
 
-#: ../app/vectors/gimpvectors.c:223
+#: ../app/vectors/gimpvectors.c:222
 msgid "Path cannot be raised higher."
 msgstr "パスをこれ以上前面に移動させられません。"
 
-#: ../app/vectors/gimpvectors.c:224
+#: ../app/vectors/gimpvectors.c:223
 msgid "Path cannot be lowered more."
 msgstr "パスをこれ以上背面に移動させられません。"
 
-#: ../app/vectors/gimpvectors.c:365
+#: ../app/vectors/gimpvectors.c:364
 msgid "Move Path"
 msgstr "パスの移動"
 
-#: ../app/vectors/gimpvectors.c:464
+#: ../app/vectors/gimpvectors.c:463
 msgid "Flip Path"
 msgstr "パスの反転"
 
-#: ../app/vectors/gimpvectors.c:495
+#: ../app/vectors/gimpvectors.c:494
 msgid "Rotate Path"
 msgstr "パスの回転"
 
-#: ../app/vectors/gimpvectors.c:525
+#: ../app/vectors/gimpvectors.c:523
 msgid "Transform Path"
 msgstr "パスの変形"
 
-#: ../app/vectors/gimpvectors-export.c:95
+#: ../app/vectors/gimpvectors-export.c:96
 #, c-format
 msgid "Error while writing '%s': %s"
 msgstr ""
 "'%s' 書き込み中にエラーが発生しました。\n"
 "%s"
 
-#: ../app/vectors/gimpvectors-import.c:330
+#: ../app/vectors/gimpvectors-import.c:331
 msgid "Import Paths"
 msgstr "パスのインポート"
 
-#: ../app/vectors/gimpvectors-import.c:341
+#: ../app/vectors/gimpvectors-import.c:342
 msgid "Imported Path"
 msgstr "インポートされたパス"
 
-#: ../app/vectors/gimpvectors-import.c:372
+#: ../app/vectors/gimpvectors-import.c:373
 #, c-format
 msgid "No paths found in '%s'"
 msgstr "'%s' にはパスが見つかりません"
 
-#: ../app/vectors/gimpvectors-import.c:376
+#: ../app/vectors/gimpvectors-import.c:377
 msgid "No paths found in the buffer"
 msgstr "バッファーにはパスが見つかりません"
 
-#: ../app/vectors/gimpvectors-import.c:386
+#: ../app/vectors/gimpvectors-import.c:387
 #, c-format
 msgid "Failed to import paths from '%s': %s"
 msgstr ""
 "'%s' からのパス読み込みに失敗しました。\n"
 "%s"
 
-#: ../app/widgets/gimpactioneditor.c:69
+#: ../app/widgets/gimpactioneditor.c:70
 msgid "_Search:"
 msgstr "検索(_S):"
 
-#: ../app/widgets/gimpactiongroup.c:858
+#: ../app/widgets/gimpactiongroup.c:857
 #, 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:337
-#: ../app/widgets/gimpcontrollereditor.c:342
+#: ../app/widgets/gimpactionview.c:339
+#: ../app/widgets/gimpcontrollereditor.c:341
 msgid "Action"
 msgstr "操作"
 
-#: ../app/widgets/gimpactionview.c:366
+#: ../app/widgets/gimpactionview.c:368
 msgid "Shortcut"
 msgstr "ショートカット"
 
-#: ../app/widgets/gimpactionview.c:392
+#: ../app/widgets/gimpactionview.c:394
 msgid "Name"
 msgstr "名前"
 
-#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:832
+#: ../app/widgets/gimpactionview.c:634 ../app/widgets/gimpactionview.c:863
 msgid "Changing shortcut failed."
 msgstr "ショートカットの変更に失敗しました"
 
-#: ../app/widgets/gimpactionview.c:669
+#: ../app/widgets/gimpactionview.c:671
 msgid "Conflicting Shortcuts"
 msgstr "ショートカットが二重定義されています"
 
-#: ../app/widgets/gimpactionview.c:675
+#: ../app/widgets/gimpactionview.c:677
 msgid "_Reassign shortcut"
 msgstr "ショートカット再割り当て(_R)"
 
-#: ../app/widgets/gimpactionview.c:690
+#: ../app/widgets/gimpactionview.c:692
 #, c-format
 msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group."
 msgstr ""
 "ショートカット \"%1$s\" は、 \"%3$s\" グループの \"%2$s\" にすでに割り当て済"
 "みです。"
 
-#: ../app/widgets/gimpactionview.c:694
+#: ../app/widgets/gimpactionview.c:696
 #, c-format
 msgid "Reassigning the shortcut will cause it to be removed from \"%s\"."
 msgstr ""
 "このショートカットを再割り当てすると、 \"%s\" に対する割り当ては削除されま"
 "す。"
 
-#: ../app/widgets/gimpactionview.c:767
+#: ../app/widgets/gimpactionview.c:791
 msgid "Invalid shortcut."
 msgstr "不正なショートカットです"
 
-#: ../app/widgets/gimpactionview.c:856
+#: ../app/widgets/gimpactionview.c:798 ../app/widgets/gimpactionview.c:891
+#, fuzzy
+#| msgid "Path cannot be lowered more."
+msgid "F1 cannot be remapped."
+msgstr "パスをこれ以上背面に移動させられません。"
+
+#: ../app/widgets/gimpactionview.c:899
 msgid "Removing shortcut failed."
 msgstr "ショートカットの削除に失敗しました"
 
+#: ../app/widgets/gimpbrusheditor.c:140
+msgid "Shape:"
+msgstr "形状:"
+
 #: ../app/widgets/gimpbrusheditor.c:167
 msgid "Spikes"
 msgstr "とがりの数"
 
-#: ../app/widgets/gimpbrusheditor.c:178
-msgid "Hardness"
-msgstr "硬さ"
-
 #: ../app/widgets/gimpbrusheditor.c:189
 msgid "Aspect ratio"
 msgstr "とがりの縦横比"
 
 #: ../app/widgets/gimpbrusheditor.c:211
 #: ../app/widgets/gimpbrushfactoryview.c:81
-#: ../app/widgets/gimpgrideditor.c:175
+#: ../app/widgets/gimpgrideditor.c:174
 msgid "Spacing"
 msgstr "間隔"
 
@@ -14932,7 +16341,7 @@ msgid "Percentage of width of brush"
 msgstr "ブラシの移動間隔を、ブラシ幅のパーセンテージで指定します"
 
 #: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264
-#: ../app/widgets/gimpeditor.c:748
+#: ../app/widgets/gimpeditor.c:747
 msgid "(None)"
 msgstr "(なし)"
 
@@ -14940,37 +16349,37 @@ msgstr "(なし)"
 msgid "Add the current color to the color history"
 msgstr "現在の色を色履歴に追加します"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:154
+#: ../app/widgets/gimpcolordisplayeditor.c:157
 msgid "Available Filters"
 msgstr "利用可能なフィルター"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:216
+#: ../app/widgets/gimpcolordisplayeditor.c:219
 msgid "Move the selected filter up"
 msgstr "選択したフィルターを上に移動"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:225
+#: ../app/widgets/gimpcolordisplayeditor.c:228
 msgid "Move the selected filter down"
 msgstr "選択したフィルターを下に移動"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:271
+#: ../app/widgets/gimpcolordisplayeditor.c:274
 msgid "Active Filters"
 msgstr "アクティブなフィルター"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:322
+#: ../app/widgets/gimpcolordisplayeditor.c:325
 msgid "Reset the selected filter to default values"
 msgstr "選択したフィルターの設定を既定値に戻します"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:496
+#: ../app/widgets/gimpcolordisplayeditor.c:527
 #, c-format
 msgid "Add '%s' to the list of active filters"
 msgstr "'%s' をアクティブなフィルターの一覧に加えます"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:533
+#: ../app/widgets/gimpcolordisplayeditor.c:564
 #, c-format
 msgid "Remove '%s' from the list of active filters"
 msgstr "'%s' をアクティブなフィルターの一覧から削除します"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:564
+#: ../app/widgets/gimpcolordisplayeditor.c:595
 msgid "No filter selected"
 msgstr "フィルターが選択されていません"
 
@@ -14982,58 +16391,60 @@ msgstr ""
 "HTML や CSS での色表現に使われる 16 進数を入力します。CSS の記述に使われる色"
 "名も入力可能です"
 
-#: ../app/widgets/gimpcolorframe.c:511 ../app/widgets/gimpcolorframe.c:572
+#: ../app/widgets/gimpcolorframe.c:557 ../app/widgets/gimpcolorframe.c:627
 msgid "Value:"
 msgstr "V (明度):"
 
-#: ../app/widgets/gimpcolorframe.c:520 ../app/widgets/gimpcolorframe.c:550
+#: ../app/widgets/gimpcolorframe.c:560 ../app/widgets/gimpcolorframe.c:569
+#: ../app/widgets/gimpcolorframe.c:600 ../app/widgets/gimpcolorframe.c:630
+#: ../app/widgets/gimpcolorframe.c:655
+msgid "Alpha:"
+msgstr "A (不透明度):"
+
+#: ../app/widgets/gimpcolorframe.c:564 ../app/widgets/gimpcolorframe.c:595
 msgid "Red:"
 msgstr "R (赤):"
 
-#: ../app/widgets/gimpcolorframe.c:521 ../app/widgets/gimpcolorframe.c:551
+#: ../app/widgets/gimpcolorframe.c:565 ../app/widgets/gimpcolorframe.c:596
 msgid "Green:"
 msgstr "G (緑):"
 
-#: ../app/widgets/gimpcolorframe.c:522 ../app/widgets/gimpcolorframe.c:552
+#: ../app/widgets/gimpcolorframe.c:566 ../app/widgets/gimpcolorframe.c:597
 msgid "Blue:"
 msgstr "B (青):"
 
-#: ../app/widgets/gimpcolorframe.c:535
+#: ../app/widgets/gimpcolorframe.c:573
 msgid "Index:"
 msgstr "インデックス:"
 
-#: ../app/widgets/gimpcolorframe.c:563
+#: ../app/widgets/gimpcolorframe.c:612
 msgid "Hex:"
 msgstr "16 進数:"
 
-#: ../app/widgets/gimpcolorframe.c:570
+#: ../app/widgets/gimpcolorframe.c:625
 msgid "Hue:"
 msgstr "H (色相):"
 
-#: ../app/widgets/gimpcolorframe.c:571
+#: ../app/widgets/gimpcolorframe.c:626
 msgid "Sat.:"
 msgstr "S (彩度):"
 
-#: ../app/widgets/gimpcolorframe.c:589
+#: ../app/widgets/gimpcolorframe.c:649
 msgid "Cyan:"
 msgstr "C (シアン):"
 
-#: ../app/widgets/gimpcolorframe.c:590
+#: ../app/widgets/gimpcolorframe.c:650
 msgid "Magenta:"
 msgstr "M (マゼンタ):"
 
-#: ../app/widgets/gimpcolorframe.c:591
+#: ../app/widgets/gimpcolorframe.c:651
 msgid "Yellow:"
 msgstr "Y (イエロー):"
 
-#: ../app/widgets/gimpcolorframe.c:592
+#: ../app/widgets/gimpcolorframe.c:652
 msgid "Black:"
 msgstr "K (ブラック):"
 
-#: ../app/widgets/gimpcolorframe.c:612
-msgid "Alpha:"
-msgstr "A (不透明度):"
-
 #: ../app/widgets/gimpcolormapeditor.c:200
 msgid "Color index:"
 msgstr "カラーインデックス:"
@@ -15042,7 +16453,7 @@ msgstr "カラーインデックス:"
 msgid "HTML notation:"
 msgstr "HTML 表記:"
 
-#: ../app/widgets/gimpcolormapeditor.c:466
+#: ../app/widgets/gimpcolormapeditor.c:465
 msgid "Only indexed images have a colormap."
 msgstr "カラーマップを持つのはインデックス画像のみです。"
 
@@ -15050,106 +16461,106 @@ msgstr "カラーマップを持つのはインデックス画像のみです。
 msgid "Palette"
 msgstr "パレット"
 
-#: ../app/widgets/gimpcontainerpopup.c:592
+#: ../app/widgets/gimpcontainerpopup.c:596
 msgid "Smaller Previews"
 msgstr "小さなプレビュー"
 
-#: ../app/widgets/gimpcontainerpopup.c:597
+#: ../app/widgets/gimpcontainerpopup.c:601
 msgid "Larger Previews"
 msgstr "大きなプレビュー"
 
-#: ../app/widgets/gimpcontrollereditor.c:199
+#: ../app/widgets/gimpcontrollereditor.c:198
 msgid "_Dump events from this controller"
 msgstr "このコントローラーからのイベントをダンプする(_D)"
 
-#: ../app/widgets/gimpcontrollereditor.c:204
+#: ../app/widgets/gimpcontrollereditor.c:203
 msgid "_Enable this controller"
 msgstr "このコントローラーを有効にする(_E)"
 
-#: ../app/widgets/gimpcontrollereditor.c:225
+#: ../app/widgets/gimpcontrollereditor.c:224
 msgid "Name:"
 msgstr "名前:"
 
-#: ../app/widgets/gimpcontrollereditor.c:231
+#: ../app/widgets/gimpcontrollereditor.c:230
 msgid "State:"
 msgstr "状態:"
 
-#: ../app/widgets/gimpcontrollereditor.c:336
+#: ../app/widgets/gimpcontrollereditor.c:335
 msgid "Event"
 msgstr "イベント"
 
-#: ../app/widgets/gimpcontrollereditor.c:361
+#: ../app/widgets/gimpcontrollereditor.c:360
 msgid "_Grab event"
 msgstr "イベントを横取り(_G)"
 
-#: ../app/widgets/gimpcontrollereditor.c:370
+#: ../app/widgets/gimpcontrollereditor.c:369
 msgid "Select the next event arriving from the controller"
 msgstr "このコントローラーからの次のイベントを選択"
 
-#: ../app/widgets/gimpcontrollereditor.c:526
+#: ../app/widgets/gimpcontrollereditor.c:525
 #, c-format
 msgid "Remove the action assigned to '%s'"
 msgstr "'%s' に割り当てられたアクションを削除"
 
-#: ../app/widgets/gimpcontrollereditor.c:531
+#: ../app/widgets/gimpcontrollereditor.c:530
 #, c-format
 msgid "Assign an action to '%s'"
 msgstr "'%s' にアクションを割り当て"
 
-#: ../app/widgets/gimpcontrollereditor.c:652
+#: ../app/widgets/gimpcontrollereditor.c:651
 #, c-format
 msgid "Select Action for Event '%s'"
 msgstr "イベント '%s' 用のアクションを選択"
 
-#: ../app/widgets/gimpcontrollereditor.c:657
+#: ../app/widgets/gimpcontrollereditor.c:656
 msgid "Select Controller Event Action"
 msgstr "コントローラーのアクションイベントを選択"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:67
-#: ../app/widgets/gimpcontrollerkeyboard.c:70
-#: ../app/widgets/gimpcontrollerkeyboard.c:73
-#: ../app/widgets/gimpcontrollerkeyboard.c:76
-#: ../app/widgets/gimpcontrollerkeyboard.c:79
-#: ../app/widgets/gimpcontrollerkeyboard.c:82
-#: ../app/widgets/gimpcontrollerkeyboard.c:85
-#: ../app/widgets/gimpcontrollerkeyboard.c:88
+#: ../app/widgets/gimpcontrollerkeyboard.c:68
+#: ../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
 msgid "Cursor Up"
 msgstr "上カーソル"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:92
-#: ../app/widgets/gimpcontrollerkeyboard.c:95
-#: ../app/widgets/gimpcontrollerkeyboard.c:98
-#: ../app/widgets/gimpcontrollerkeyboard.c:101
-#: ../app/widgets/gimpcontrollerkeyboard.c:104
-#: ../app/widgets/gimpcontrollerkeyboard.c:107
-#: ../app/widgets/gimpcontrollerkeyboard.c:110
-#: ../app/widgets/gimpcontrollerkeyboard.c:113
+#: ../app/widgets/gimpcontrollerkeyboard.c:93
+#: ../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
 msgid "Cursor Down"
 msgstr "下カーソル"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:117
-#: ../app/widgets/gimpcontrollerkeyboard.c:120
-#: ../app/widgets/gimpcontrollerkeyboard.c:123
-#: ../app/widgets/gimpcontrollerkeyboard.c:126
-#: ../app/widgets/gimpcontrollerkeyboard.c:129
-#: ../app/widgets/gimpcontrollerkeyboard.c:132
-#: ../app/widgets/gimpcontrollerkeyboard.c:135
-#: ../app/widgets/gimpcontrollerkeyboard.c:138
+#: ../app/widgets/gimpcontrollerkeyboard.c:118
+#: ../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
 msgid "Cursor Left"
 msgstr "左カーソル"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:142
-#: ../app/widgets/gimpcontrollerkeyboard.c:145
-#: ../app/widgets/gimpcontrollerkeyboard.c:148
-#: ../app/widgets/gimpcontrollerkeyboard.c:151
-#: ../app/widgets/gimpcontrollerkeyboard.c:154
-#: ../app/widgets/gimpcontrollerkeyboard.c:157
-#: ../app/widgets/gimpcontrollerkeyboard.c:160
-#: ../app/widgets/gimpcontrollerkeyboard.c:163
+#: ../app/widgets/gimpcontrollerkeyboard.c:143
+#: ../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
 msgid "Cursor Right"
 msgstr "右カーソル"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:175
+#: ../app/widgets/gimpcontrollerkeyboard.c:176
 msgid "Keyboard"
 msgstr "キーボード"
 
@@ -15183,17 +16594,17 @@ msgstr "選択したコントローラーを上に移動"
 msgid "Move the selected controller down"
 msgstr "選択したコントローラーを下に移動"
 
-#: ../app/widgets/gimpcontrollerlist.c:428
+#: ../app/widgets/gimpcontrollerlist.c:427
 #, c-format
 msgid "Add '%s' to the list of active controllers"
 msgstr "'%s' をアクティブなコントローラーの一覧に追加します"
 
-#: ../app/widgets/gimpcontrollerlist.c:479
+#: ../app/widgets/gimpcontrollerlist.c:478
 #, c-format
 msgid "Remove '%s' from the list of active controllers"
 msgstr "'%s' をアクティブなコントローラーの一覧から削除します"
 
-#: ../app/widgets/gimpcontrollerlist.c:513
+#: ../app/widgets/gimpcontrollerlist.c:512
 msgid ""
 "There can only be one active keyboard controller.\n"
 "\n"
@@ -15204,7 +16615,7 @@ msgstr ""
 "キーボードコントローラーは、既にアクティブなコントローラーの一覧に入っていま"
 "す。"
 
-#: ../app/widgets/gimpcontrollerlist.c:524
+#: ../app/widgets/gimpcontrollerlist.c:523
 msgid ""
 "There can only be one active wheel controller.\n"
 "\n"
@@ -15215,7 +16626,7 @@ msgstr ""
 "ホイールコントローラーは、既にアクティブなコントローラーの一覧に入っていま"
 "す。"
 
-#: ../app/widgets/gimpcontrollerlist.c:535
+#: ../app/widgets/gimpcontrollerlist.c:534
 msgid ""
 "There can only be one active mouse controller.\n"
 "\n"
@@ -15225,24 +16636,24 @@ msgstr ""
 "\n"
 "マウスコントローラーは、既にアクティブなコントローラーの一覧に入っています。"
 
-#: ../app/widgets/gimpcontrollerlist.c:561
+#: ../app/widgets/gimpcontrollerlist.c:560
 msgid "Remove Controller?"
 msgstr "コントローラーを削除しますか?"
 
-#: ../app/widgets/gimpcontrollerlist.c:566
+#: ../app/widgets/gimpcontrollerlist.c:565
 msgid "Disable Controller"
 msgstr "コントローラーの無効化"
 
-#: ../app/widgets/gimpcontrollerlist.c:568
+#: ../app/widgets/gimpcontrollerlist.c:567
 msgid "Remove Controller"
 msgstr "コントローラーの削除"
 
-#: ../app/widgets/gimpcontrollerlist.c:580
+#: ../app/widgets/gimpcontrollerlist.c:579
 #, c-format
 msgid "Remove Controller '%s'?"
 msgstr "コントローラー '%s' を削除しますか?"
 
-#: ../app/widgets/gimpcontrollerlist.c:584
+#: ../app/widgets/gimpcontrollerlist.c:583
 msgid ""
 "Removing this controller from the list of active controllers will "
 "permanently delete all event mappings you have configured.\n"
@@ -15256,66 +16667,66 @@ msgstr ""
 "[コントローラーの無効化] を選ぶと、イベント割り当ては削除せずにコントローラー"
 "を無効化します。"
 
-#: ../app/widgets/gimpcontrollerlist.c:636
+#: ../app/widgets/gimpcontrollerlist.c:635
 msgid "Configure Input Controller"
 msgstr "入力コントローラーの設定"
 
-#: ../app/widgets/gimpcontrollermouse.c:70
-#: ../app/widgets/gimpcontrollermouse.c:73
-#: ../app/widgets/gimpcontrollermouse.c:76
-#: ../app/widgets/gimpcontrollermouse.c:79
-#: ../app/widgets/gimpcontrollermouse.c:82
-#: ../app/widgets/gimpcontrollermouse.c:85
-#: ../app/widgets/gimpcontrollermouse.c:88
-#: ../app/widgets/gimpcontrollermouse.c:91
+#: ../app/widgets/gimpcontrollermouse.c:71
+#: ../app/widgets/gimpcontrollermouse.c:74
+#: ../app/widgets/gimpcontrollermouse.c:77
+#: ../app/widgets/gimpcontrollermouse.c:80
+#: ../app/widgets/gimpcontrollermouse.c:83
+#: ../app/widgets/gimpcontrollermouse.c:86
+#: ../app/widgets/gimpcontrollermouse.c:89
+#: ../app/widgets/gimpcontrollermouse.c:92
 msgid "Button 8"
 msgstr "ボタン 8"
 
-#: ../app/widgets/gimpcontrollermouse.c:95
-#: ../app/widgets/gimpcontrollermouse.c:98
-#: ../app/widgets/gimpcontrollermouse.c:101
-#: ../app/widgets/gimpcontrollermouse.c:104
-#: ../app/widgets/gimpcontrollermouse.c:107
-#: ../app/widgets/gimpcontrollermouse.c:110
-#: ../app/widgets/gimpcontrollermouse.c:113
-#: ../app/widgets/gimpcontrollermouse.c:116
+#: ../app/widgets/gimpcontrollermouse.c:96
+#: ../app/widgets/gimpcontrollermouse.c:99
+#: ../app/widgets/gimpcontrollermouse.c:102
+#: ../app/widgets/gimpcontrollermouse.c:105
+#: ../app/widgets/gimpcontrollermouse.c:108
+#: ../app/widgets/gimpcontrollermouse.c:111
+#: ../app/widgets/gimpcontrollermouse.c:114
+#: ../app/widgets/gimpcontrollermouse.c:117
 msgid "Button 9"
 msgstr "ボタン 9"
 
-#: ../app/widgets/gimpcontrollermouse.c:120
-#: ../app/widgets/gimpcontrollermouse.c:123
-#: ../app/widgets/gimpcontrollermouse.c:126
-#: ../app/widgets/gimpcontrollermouse.c:129
-#: ../app/widgets/gimpcontrollermouse.c:132
-#: ../app/widgets/gimpcontrollermouse.c:135
-#: ../app/widgets/gimpcontrollermouse.c:138
-#: ../app/widgets/gimpcontrollermouse.c:141
+#: ../app/widgets/gimpcontrollermouse.c:121
+#: ../app/widgets/gimpcontrollermouse.c:124
+#: ../app/widgets/gimpcontrollermouse.c:127
+#: ../app/widgets/gimpcontrollermouse.c:130
+#: ../app/widgets/gimpcontrollermouse.c:133
+#: ../app/widgets/gimpcontrollermouse.c:136
+#: ../app/widgets/gimpcontrollermouse.c:139
+#: ../app/widgets/gimpcontrollermouse.c:142
 msgid "Button 10"
 msgstr "ボタン 10"
 
-#: ../app/widgets/gimpcontrollermouse.c:145
-#: ../app/widgets/gimpcontrollermouse.c:148
-#: ../app/widgets/gimpcontrollermouse.c:151
-#: ../app/widgets/gimpcontrollermouse.c:154
-#: ../app/widgets/gimpcontrollermouse.c:157
-#: ../app/widgets/gimpcontrollermouse.c:160
-#: ../app/widgets/gimpcontrollermouse.c:163
-#: ../app/widgets/gimpcontrollermouse.c:166
+#: ../app/widgets/gimpcontrollermouse.c:146
+#: ../app/widgets/gimpcontrollermouse.c:149
+#: ../app/widgets/gimpcontrollermouse.c:152
+#: ../app/widgets/gimpcontrollermouse.c:155
+#: ../app/widgets/gimpcontrollermouse.c:158
+#: ../app/widgets/gimpcontrollermouse.c:161
+#: ../app/widgets/gimpcontrollermouse.c:164
+#: ../app/widgets/gimpcontrollermouse.c:167
 msgid "Button 11"
 msgstr "ボタン 11"
 
-#: ../app/widgets/gimpcontrollermouse.c:170
-#: ../app/widgets/gimpcontrollermouse.c:173
-#: ../app/widgets/gimpcontrollermouse.c:176
-#: ../app/widgets/gimpcontrollermouse.c:179
-#: ../app/widgets/gimpcontrollermouse.c:182
-#: ../app/widgets/gimpcontrollermouse.c:185
-#: ../app/widgets/gimpcontrollermouse.c:188
-#: ../app/widgets/gimpcontrollermouse.c:191
+#: ../app/widgets/gimpcontrollermouse.c:171
+#: ../app/widgets/gimpcontrollermouse.c:174
+#: ../app/widgets/gimpcontrollermouse.c:177
+#: ../app/widgets/gimpcontrollermouse.c:180
+#: ../app/widgets/gimpcontrollermouse.c:183
+#: ../app/widgets/gimpcontrollermouse.c:186
+#: ../app/widgets/gimpcontrollermouse.c:189
+#: ../app/widgets/gimpcontrollermouse.c:192
 msgid "Button 12"
 msgstr "ボタン 12"
 
-#: ../app/widgets/gimpcontrollermouse.c:203
+#: ../app/widgets/gimpcontrollermouse.c:204
 msgid "Mouse Buttons"
 msgstr "マウスボタン"
 
@@ -15323,51 +16734,51 @@ msgstr "マウスボタン"
 msgid "Mouse Button Events"
 msgstr "マウスボタンのイベント"
 
-#: ../app/widgets/gimpcontrollerwheel.c:69
-#: ../app/widgets/gimpcontrollerwheel.c:72
-#: ../app/widgets/gimpcontrollerwheel.c:75
-#: ../app/widgets/gimpcontrollerwheel.c:78
-#: ../app/widgets/gimpcontrollerwheel.c:81
-#: ../app/widgets/gimpcontrollerwheel.c:84
-#: ../app/widgets/gimpcontrollerwheel.c:87
-#: ../app/widgets/gimpcontrollerwheel.c:90
+#: ../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
 msgid "Scroll Up"
 msgstr "上にスクロール"
 
-#: ../app/widgets/gimpcontrollerwheel.c:94
-#: ../app/widgets/gimpcontrollerwheel.c:97
-#: ../app/widgets/gimpcontrollerwheel.c:100
-#: ../app/widgets/gimpcontrollerwheel.c:103
-#: ../app/widgets/gimpcontrollerwheel.c:106
-#: ../app/widgets/gimpcontrollerwheel.c:109
-#: ../app/widgets/gimpcontrollerwheel.c:112
-#: ../app/widgets/gimpcontrollerwheel.c:115
+#: ../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
 msgid "Scroll Down"
 msgstr "下にスクロール"
 
-#: ../app/widgets/gimpcontrollerwheel.c:119
-#: ../app/widgets/gimpcontrollerwheel.c:122
-#: ../app/widgets/gimpcontrollerwheel.c:125
-#: ../app/widgets/gimpcontrollerwheel.c:128
-#: ../app/widgets/gimpcontrollerwheel.c:131
-#: ../app/widgets/gimpcontrollerwheel.c:134
-#: ../app/widgets/gimpcontrollerwheel.c:137
-#: ../app/widgets/gimpcontrollerwheel.c:140
+#: ../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
 msgid "Scroll Left"
 msgstr "左にスクロール"
 
-#: ../app/widgets/gimpcontrollerwheel.c:144
-#: ../app/widgets/gimpcontrollerwheel.c:147
-#: ../app/widgets/gimpcontrollerwheel.c:150
-#: ../app/widgets/gimpcontrollerwheel.c:153
-#: ../app/widgets/gimpcontrollerwheel.c:156
-#: ../app/widgets/gimpcontrollerwheel.c:159
-#: ../app/widgets/gimpcontrollerwheel.c:162
-#: ../app/widgets/gimpcontrollerwheel.c:165
+#: ../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
 msgid "Scroll Right"
 msgstr "右にスクロール"
 
-#: ../app/widgets/gimpcontrollerwheel.c:177
+#: ../app/widgets/gimpcontrollerwheel.c:178
 msgid "Mouse Wheel"
 msgstr "マウスホイール"
 
@@ -15375,15 +16786,15 @@ msgstr "マウスホイール"
 msgid "Mouse Wheel Events"
 msgstr "マウスホイールのイベント"
 
-#: ../app/widgets/gimpdataeditor.c:216
+#: ../app/widgets/gimpdataeditor.c:215
 msgid "Save"
 msgstr "保存"
 
-#: ../app/widgets/gimpdataeditor.c:224
+#: ../app/widgets/gimpdataeditor.c:223
 msgid "Revert"
 msgstr "復帰"
 
-#: ../app/widgets/gimpdataeditor.c:436
+#: ../app/widgets/gimpdataeditor.c:435
 #, c-format
 msgid "%s (read only)"
 msgstr "%s (読み込み専用)"
@@ -15392,16 +16803,16 @@ msgstr "%s (読み込み専用)"
 msgid "Delete the selected device"
 msgstr "選択したデバイスを削除します"
 
-#: ../app/widgets/gimpdeviceeditor.c:503
+#: ../app/widgets/gimpdeviceeditor.c:502
 msgid "Delete Device Settings"
 msgstr "選択したデバイス設定を削除します"
 
-#: ../app/widgets/gimpdeviceeditor.c:524
+#: ../app/widgets/gimpdeviceeditor.c:523
 #, c-format
 msgid "Delete \"%s\"?"
 msgstr "\"%s\" を削除しますか?"
 
-#: ../app/widgets/gimpdeviceeditor.c:527
+#: ../app/widgets/gimpdeviceeditor.c:526
 msgid ""
 "You are about to delete this device's stored settings.\n"
 "The next time this device is plugged, default settings will be used."
@@ -15423,39 +16834,42 @@ msgstr "X方向の傾き"
 msgid "Y tilt"
 msgstr "Y方向の傾き"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:144
+#. Wheel as in mouse or input device wheel
+#: ../app/widgets/gimpdeviceinfoeditor.c:145
 #: ../app/widgets/gimpdynamicseditor.c:146
 #: ../app/widgets/gimpdynamicsoutputeditor.c:74
 msgid "Wheel"
 msgstr "ホイール"
 
 #. the axes
-#: ../app/widgets/gimpdeviceinfoeditor.c:194
+#. The axes of an input device
+#: ../app/widgets/gimpdeviceinfoeditor.c:196
 msgid "Axes"
 msgstr "グラフ軸"
 
 #. the keys
-#: ../app/widgets/gimpdeviceinfoeditor.c:268
+#: ../app/widgets/gimpdeviceinfoeditor.c:270
 msgid "Keys"
 msgstr "キー"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:365
-#: ../app/widgets/gimpdeviceinfoeditor.c:583
+#: ../app/widgets/gimpdeviceinfoeditor.c:366
+#: ../app/widgets/gimpdeviceinfoeditor.c:585
 #, c-format
 msgid "none"
 msgstr "なし"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:413
+#. e.g. "Pressure Curve" for mapping input device axes
+#: ../app/widgets/gimpdeviceinfoeditor.c:415
 #, c-format
 msgid "%s Curve"
 msgstr "'%s' のカーブ"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:472
-#: ../app/widgets/gimpdynamicsoutputeditor.c:210
+#: ../app/widgets/gimpdeviceinfoeditor.c:474
+#: ../app/widgets/gimpdynamicsoutputeditor.c:209
 msgid "_Reset Curve"
 msgstr "カーブのリセット(_R)"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:485
+#: ../app/widgets/gimpdeviceinfoeditor.c:487
 #, c-format
 msgid "The axis '%s' has no curve"
 msgstr "'%s' にはカーブがありません"
@@ -15464,34 +16878,34 @@ msgstr "'%s' にはカーブがありません"
 msgid "Save device status"
 msgstr "デバイスの状態を保存"
 
-#: ../app/widgets/gimpdevicestatus.c:434
+#: ../app/widgets/gimpdevicestatus.c:433
 #, c-format
 msgid "Foreground: %d, %d, %d"
 msgstr "描画色: %d, %d, %d"
 
-#: ../app/widgets/gimpdevicestatus.c:439
+#: ../app/widgets/gimpdevicestatus.c:438
 #, c-format
 msgid "Background: %d, %d, %d"
 msgstr "背景色: %d, %d, %d"
 
-#: ../app/widgets/gimpdnd-xds.c:203
+#: ../app/widgets/gimpdnd-xds.c:204
 msgid "The given filename does not have any known file extension."
 msgstr "指定されたファイル名に既知のファイル拡張子がありません。"
 
-#: ../app/widgets/gimpdnd-xds.c:221
+#: ../app/widgets/gimpdnd-xds.c:222
 msgid "File Exists"
 msgstr "ファイルは存在します"
 
-#: ../app/widgets/gimpdnd-xds.c:226
+#: ../app/widgets/gimpdnd-xds.c:227
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: ../app/widgets/gimpdnd-xds.c:237
+#: ../app/widgets/gimpdnd-xds.c:238
 #, c-format
 msgid "A file named '%s' already exists."
 msgstr "ファイル名 '%s' は既に存在します"
 
-#: ../app/widgets/gimpdnd-xds.c:242
+#: ../app/widgets/gimpdnd-xds.c:243
 msgid "Do you want to replace it with the image you are saving?"
 msgstr "保存しようとしている画像で置き換えますか?"
 
@@ -15522,19 +16936,27 @@ msgid " | "
 msgstr " | "
 
 #. Auto button
-#: ../app/widgets/gimpdockwindow.c:382
+#: ../app/widgets/gimpdockwindow.c:385
 msgid "Auto"
 msgstr "自動"
 
-#: ../app/widgets/gimpdockwindow.c:393
+#: ../app/widgets/gimpdockwindow.c:396
+#, fuzzy
+#| msgid ""
+#| "When enabled the dialog automatically follows the image you are working "
+#| "on."
 msgid ""
-"When enabled the dialog automatically follows the image you are working on."
+"When enabled, the dialog automatically follows the image you are working on."
 msgstr "有効にすると、現在作業中の画像にダイアログが自動的に追従します。"
 
 #: ../app/widgets/gimpdrawabletreeview.c:121
 msgid "Lock pixels"
 msgstr "すべてのピクセルを保護"
 
+#: ../app/widgets/gimpdrawabletreeview.c:123
+msgid "Lock position and size"
+msgstr ""
+
 #: ../app/widgets/gimpdynamicseditor.c:136
 msgid "Mapping matrix"
 msgstr "対応状況の一覧"
@@ -15554,36 +16976,48 @@ msgstr "不規則"
 msgid "Fade"
 msgstr "フェード"
 
-#: ../app/widgets/gimperrordialog.c:150
+#: ../app/widgets/gimperrordialog.c:151
 msgid "Too many error messages!"
 msgstr "エラーメッセージが多すぎます!"
 
-#: ../app/widgets/gimperrordialog.c:151
+#: ../app/widgets/gimperrordialog.c:152
 msgid "Messages are redirected to stderr."
 msgstr "メッセージは標準エラー出力に出力されます。"
 
-#: ../app/widgets/gimperrordialog.c:170
+#. %s is a message domain,
+#. * like "GIMP Message" or
+#. * "PNG Message"
+#.
+#: ../app/widgets/gimperrordialog.c:175
 #, c-format
 msgid "%s Message"
 msgstr "%s エラーメッセージ"
 
-#: ../app/widgets/gimpfiledialog.c:327
+#: ../app/widgets/gimpfiledialog.c:330
 msgid "Automatically Detected"
 msgstr "自動判別"
 
-#: ../app/widgets/gimpfiledialog.c:344
+#: ../app/widgets/gimpfiledialog.c:347
 msgid "By Extension"
 msgstr "拡張子で判別"
 
-#: ../app/widgets/gimpfiledialog.c:793
+#: ../app/widgets/gimpfiledialog.c:801
 msgid "All files"
 msgstr "すべてのファイル"
 
-#: ../app/widgets/gimpfiledialog.c:798
+#: ../app/widgets/gimpfiledialog.c:806
 msgid "All images"
 msgstr "すべての画像"
 
-#: ../app/widgets/gimpfiledialog.c:974
+#: ../app/widgets/gimpfiledialog.c:813
+msgid "All XCF images"
+msgstr "すべての XCF 画像"
+
+#: ../app/widgets/gimpfiledialog.c:815
+msgid "All export images"
+msgstr "エクスポートされたすべての画像"
+
+#: ../app/widgets/gimpfiledialog.c:999
 #, c-format
 msgid "Select File _Type (%s)"
 msgstr "ファイル形式の選択(_T) (現在の設定: %s)"
@@ -15604,113 +17038,113 @@ msgstr "描画色で塗りつぶす"
 msgid "_Antialiasing"
 msgstr "アンチエイリアス(_A)"
 
-#: ../app/widgets/gimpgradienteditor.c:754
+#: ../app/widgets/gimpgradienteditor.c:753
 #, c-format
 msgid "Zoom factor: %d:1"
 msgstr "倍率: %d:1"
 
-#: ../app/widgets/gimpgradienteditor.c:757
+#: ../app/widgets/gimpgradienteditor.c:756
 #, c-format
 msgid "Displaying [%0.4f, %0.4f]"
 msgstr "表示 [%0.4f, %0.4f]"
 
-#: ../app/widgets/gimpgradienteditor.c:954
+#: ../app/widgets/gimpgradienteditor.c:953
 #, c-format
 msgid "Position: %0.4f"
 msgstr "位置: %0.4f"
 
-#: ../app/widgets/gimpgradienteditor.c:955
+#: ../app/widgets/gimpgradienteditor.c:954
 #, c-format
 msgid "RGB (%0.3f, %0.3f, %0.3f)"
 msgstr "RGB (%0.3f, %0.3f, %0.3f)"
 
-#: ../app/widgets/gimpgradienteditor.c:957
+#: ../app/widgets/gimpgradienteditor.c:956
 #, c-format
 msgid "HSV (%0.1f, %0.1f, %0.1f)"
 msgstr "HSV (%0.1f, %0.1f, %0.1f)"
 
-#: ../app/widgets/gimpgradienteditor.c:959
+#: ../app/widgets/gimpgradienteditor.c:958
 #, c-format
 msgid "Luminance: %0.1f    Opacity: %0.1f"
 msgstr "輝度: %0.1f    不透明度: %0.1f"
 
-#: ../app/widgets/gimpgradienteditor.c:990
+#: ../app/widgets/gimpgradienteditor.c:989
 #, c-format
 msgid "RGB (%d, %d, %d)"
 msgstr "RGB (%d, %d, %d)"
 
-#: ../app/widgets/gimpgradienteditor.c:1001
+#: ../app/widgets/gimpgradienteditor.c:1000
 msgid "Foreground color set to:"
 msgstr "描画色を以下に設定:"
 
-#: ../app/widgets/gimpgradienteditor.c:1008
+#: ../app/widgets/gimpgradienteditor.c:1007
 msgid "Background color set to:"
 msgstr "背景色を以下に設定:"
 
-#: ../app/widgets/gimpgradienteditor.c:1236
-#: ../app/widgets/gimpgradienteditor.c:1297
+#: ../app/widgets/gimpgradienteditor.c:1235
+#: ../app/widgets/gimpgradienteditor.c:1296
 #, c-format
 msgid "%s-Drag: move & compress"
 msgstr "%s-ドラッグ: 移動と伸縮"
 
-#: ../app/widgets/gimpgradienteditor.c:1241
+#: ../app/widgets/gimpgradienteditor.c:1240
 msgid "Drag: move"
 msgstr "ドラッグ: 移動"
 
-#: ../app/widgets/gimpgradienteditor.c:1248
-#: ../app/widgets/gimpgradienteditor.c:1261
-#: ../app/widgets/gimpgradienteditor.c:1274
-#: ../app/widgets/gimpgradienteditor.c:1295
+#: ../app/widgets/gimpgradienteditor.c:1247
+#: ../app/widgets/gimpgradienteditor.c:1260
+#: ../app/widgets/gimpgradienteditor.c:1273
+#: ../app/widgets/gimpgradienteditor.c:1294
 #, c-format
 msgid "%s-Click: extend selection"
 msgstr "%s-クリック: 範囲選択"
 
-#: ../app/widgets/gimpgradienteditor.c:1253
-#: ../app/widgets/gimpgradienteditor.c:1266
+#: ../app/widgets/gimpgradienteditor.c:1252
+#: ../app/widgets/gimpgradienteditor.c:1265
 msgid "Click: select"
 msgstr "クリック: 選択"
 
-#: ../app/widgets/gimpgradienteditor.c:1279
-#: ../app/widgets/gimpgradienteditor.c:1301
+#: ../app/widgets/gimpgradienteditor.c:1278
+#: ../app/widgets/gimpgradienteditor.c:1300
 msgid "Click: select    Drag: move"
 msgstr "クリック: 選択    ドラッグ: 移動"
 
-#: ../app/widgets/gimpgradienteditor.c:1516
-#: ../app/widgets/gimpgradienteditor.c:1524
+#: ../app/widgets/gimpgradienteditor.c:1515
+#: ../app/widgets/gimpgradienteditor.c:1523
 #, c-format
 msgid "Handle position: %0.4f"
 msgstr "制御点の移動: %0.4f"
 
-#: ../app/widgets/gimpgradienteditor.c:1541
+#: ../app/widgets/gimpgradienteditor.c:1540
 #, c-format
 msgid "Distance: %0.4f"
 msgstr "セグメントの移動: %0.4f"
 
-#: ../app/widgets/gimpgrideditor.c:148
+#: ../app/widgets/gimpgrideditor.c:147
 msgid "Line _style:"
 msgstr "線種(_S):"
 
-#: ../app/widgets/gimpgrideditor.c:152
+#: ../app/widgets/gimpgrideditor.c:151
 msgid "Change grid foreground color"
 msgstr "グリッドの描画色を変更"
 
-#: ../app/widgets/gimpgrideditor.c:159
+#: ../app/widgets/gimpgrideditor.c:158
 msgid "_Foreground color:"
 msgstr "描画色(_F):"
 
-#: ../app/widgets/gimpgrideditor.c:163
+#: ../app/widgets/gimpgrideditor.c:162
 msgid "Change grid background color"
 msgstr "グリッドの背景色を変更"
 
-#: ../app/widgets/gimpgrideditor.c:170
+#: ../app/widgets/gimpgrideditor.c:169
 msgid "_Background color:"
 msgstr "背景色(_B):"
 
-#: ../app/widgets/gimpgrideditor.c:196 ../app/widgets/gimpgrideditor.c:228
+#: ../app/widgets/gimpgrideditor.c:195 ../app/widgets/gimpgrideditor.c:227
 msgid "Width"
 msgstr "幅"
 
-#: ../app/widgets/gimpgrideditor.c:198 ../app/widgets/gimpgrideditor.c:230
+#: ../app/widgets/gimpgrideditor.c:197 ../app/widgets/gimpgrideditor.c:229
 msgid "Height"
 msgstr "高さ"
 
@@ -15793,6 +17227,34 @@ msgstr "パーセンタイル:"
 msgid "Channel:"
 msgstr "チャンネル:"
 
+#: ../app/widgets/gimpiconpicker.c:242
+msgid "From File..."
+msgstr ""
+
+#: ../app/widgets/gimpiconpicker.c:251
+msgid "From Stock Icons..."
+msgstr ""
+
+#: ../app/widgets/gimpiconpicker.c:260
+#, fuzzy
+#| msgctxt "documents-action"
+#| msgid "Copy image location to clipboard"
+msgid "Copy Icon to Clipboard"
+msgstr "画像の場所(URI)をクリップボードへコピーします"
+
+#: ../app/widgets/gimpiconpicker.c:269
+#, fuzzy
+#| msgctxt "edit-action"
+#| msgid "Paste the content of the clipboard"
+msgid "Paste Icon from Clipboard"
+msgstr "クリップボードの内容を貼り付けます"
+
+#: ../app/widgets/gimpiconpicker.c:509
+#, fuzzy
+#| msgid "command|Crop Image"
+msgid "Load Icon Image"
+msgstr "画像の切り抜き"
+
 #. Button
 #: ../app/widgets/gimpimagecommenteditor.c:107
 msgid "Use default comment"
@@ -15810,92 +17272,97 @@ msgstr ""
 msgid "Querying..."
 msgstr "問い合わせています..."
 
-#: ../app/widgets/gimpimagepropview.c:120
+#: ../app/widgets/gimpimagepropview.c:113
 msgid "Size in pixels:"
 msgstr "ピクセルサイズ:"
 
-#: ../app/widgets/gimpimagepropview.c:123
+#: ../app/widgets/gimpimagepropview.c:116
 msgid "Print size:"
 msgstr "印刷サイズ:"
 
-#: ../app/widgets/gimpimagepropview.c:126
+#: ../app/widgets/gimpimagepropview.c:119
 msgid "Resolution:"
 msgstr "解像度:"
 
-#: ../app/widgets/gimpimagepropview.c:129
+#: ../app/widgets/gimpimagepropview.c:122
 msgid "Color space:"
 msgstr "色空間:"
 
-#: ../app/widgets/gimpimagepropview.c:132
+#: ../app/widgets/gimpimagepropview.c:125
 #, fuzzy
+#| msgid "Direction:"
 msgid "Precision:"
 msgstr "方向:"
 
-#: ../app/widgets/gimpimagepropview.c:137
+#: ../app/widgets/gimpimagepropview.c:130
 msgid "File Name:"
 msgstr "ファイル名:"
 
-#: ../app/widgets/gimpimagepropview.c:143
+#: ../app/widgets/gimpimagepropview.c:136
 msgid "File Size:"
 msgstr "ファイルサイズ:"
 
-#: ../app/widgets/gimpimagepropview.c:146
+#: ../app/widgets/gimpimagepropview.c:139
 msgid "File Type:"
 msgstr "ファイル形式:"
 
-#: ../app/widgets/gimpimagepropview.c:151
+#: ../app/widgets/gimpimagepropview.c:144
 msgid "Size in memory:"
 msgstr "メモリ中のサイズ:"
 
-#: ../app/widgets/gimpimagepropview.c:154
+#: ../app/widgets/gimpimagepropview.c:147
 msgid "Undo steps:"
 msgstr "元に戻せるステップ:"
 
-#: ../app/widgets/gimpimagepropview.c:157
+#: ../app/widgets/gimpimagepropview.c:150
 msgid "Redo steps:"
 msgstr "やり直せるステップ:"
 
-#: ../app/widgets/gimpimagepropview.c:162
+#: ../app/widgets/gimpimagepropview.c:155
 msgid "Number of pixels:"
 msgstr "ピクセル数:"
 
-#: ../app/widgets/gimpimagepropview.c:165
+#: ../app/widgets/gimpimagepropview.c:158
 msgid "Number of layers:"
 msgstr "レイヤー数:"
 
-#: ../app/widgets/gimpimagepropview.c:168
+#: ../app/widgets/gimpimagepropview.c:161
 msgid "Number of channels:"
 msgstr "チャンネル数:"
 
-#: ../app/widgets/gimpimagepropview.c:171
+#: ../app/widgets/gimpimagepropview.c:164
 msgid "Number of paths:"
 msgstr "パス数:"
 
 #. no undo (or redo) steps available
-#: ../app/widgets/gimpimagepropview.c:414
+#: ../app/widgets/gimpimagepropview.c:412
 msgid "None"
 msgstr "なし"
 
-#: ../app/widgets/gimpimagepropview.c:469
-#: ../app/widgets/gimptemplateeditor.c:332
+#: ../app/widgets/gimpimagepropview.c:467
+#: ../app/widgets/gimptemplateeditor.c:331
 #, c-format
 msgid "pixels/%s"
 msgstr "ピクセル/%s"
 
-#: ../app/widgets/gimpimagepropview.c:471
+#: ../app/widgets/gimpimagepropview.c:469
 #, c-format
 msgid "%g × %g %s"
 msgstr "%g × %g %s"
 
-#: ../app/widgets/gimpimagepropview.c:492
+#: ../app/widgets/gimpimagepropview.c:490
 msgid "colors"
 msgstr "色"
 
-#: ../app/widgets/gimpitemtreeview.c:716
+#: ../app/widgets/gimpitemtreeview.c:745
 msgid "Lock:"
 msgstr "保護:"
 
-#: ../app/widgets/gimplayertreeview.c:307
+#: ../app/widgets/gimplanguagestore-parser.c:247
+msgid "System Language"
+msgstr "システム設定の言語"
+
+#: ../app/widgets/gimplayertreeview.c:310
 msgid "Lock alpha channel"
 msgstr "透明部分を保護"
 
@@ -15906,7 +17373,7 @@ msgid_plural "Message repeated %d times."
 msgstr[0] "同じメッセージが %d 回繰り返されました。"
 
 #: ../app/widgets/gimppaletteeditor.c:227
-#: ../app/widgets/gimppaletteeditor.c:683
+#: ../app/widgets/gimppaletteeditor.c:682
 msgid "Undefined"
 msgstr "名前なし"
 
@@ -15918,14 +17385,32 @@ msgstr "列:"
 msgid "You can drop dockable dialogs here"
 msgstr "ここにドッキング可能なダイアログをドロップできます"
 
-#: ../app/widgets/gimpprofilechooserdialog.c:127
+#: ../app/widgets/gimpprofilechooserdialog.c:126
 msgid "ICC color profile (*.icc, *.icm)"
 msgstr "ICC カラープロファイル (*.icc, *.icm)"
 
-#: ../app/widgets/gimpprogressdialog.c:221
+#: ../app/widgets/gimpprogressdialog.c:222
 msgid "Progress"
 msgstr "進度"
 
+#: ../app/widgets/gimpproptable.c:186
+#, fuzzy
+#| msgid "New palette"
+msgid "New Seed"
+msgstr "新規パレット"
+
+#: ../app/widgets/gimpproptable.c:298
+#, fuzzy
+#| msgid "Pick a setting from the list"
+msgid "Pick coordinates from the image"
+msgstr "あらかじめ設定されたパラメーターを一覧から選んで代入します"
+
+#: ../app/widgets/gimpproptable.c:330
+#, fuzzy
+#| msgid "Colorize the Image"
+msgid "Pick color from the image"
+msgstr "画像の着色"
+
 #: ../app/widgets/gimpselectiondata.c:248
 #, c-format
 msgid ""
@@ -15977,15 +17462,15 @@ msgstr "保存済設定"
 msgid "Manage Saved Settings"
 msgstr "プリセットデータの編集"
 
-#: ../app/widgets/gimpsettingseditor.c:195
+#: ../app/widgets/gimpsettingseditor.c:194
 msgid "Import settings from a file"
 msgstr "プリセットデータをファイルからインポートします"
 
-#: ../app/widgets/gimpsettingseditor.c:204
+#: ../app/widgets/gimpsettingseditor.c:203
 msgid "Export the selected settings to a file"
 msgstr "選択したプリセットデータをファイルにエクスポートします"
 
-#: ../app/widgets/gimpsettingseditor.c:213
+#: ../app/widgets/gimpsettingseditor.c:212
 msgid "Delete the selected settings"
 msgstr "選択したプリセットデータを削除します"
 
@@ -15999,31 +17484,31 @@ msgstr "%d x %d dpi"
 msgid "%d ppi"
 msgstr "%d dpi"
 
-#: ../app/widgets/gimpstrokeeditor.c:130
+#: ../app/widgets/gimpstrokeeditor.c:129
 msgid "Line width:"
 msgstr "線の幅:"
 
-#: ../app/widgets/gimpstrokeeditor.c:142
+#: ../app/widgets/gimpstrokeeditor.c:141
 msgid "_Line Style"
 msgstr "線の種類(_L):"
 
-#: ../app/widgets/gimpstrokeeditor.c:161
+#: ../app/widgets/gimpstrokeeditor.c:160
 msgid "_Cap style:"
 msgstr "端のスタイル(_C):"
 
-#: ../app/widgets/gimpstrokeeditor.c:167
+#: ../app/widgets/gimpstrokeeditor.c:166
 msgid "_Join style:"
 msgstr "結合スタイル(_J):"
 
-#: ../app/widgets/gimpstrokeeditor.c:172
+#: ../app/widgets/gimpstrokeeditor.c:171
 msgid "_Miter limit:"
 msgstr "斜め継ぎ限界(_M):"
 
-#: ../app/widgets/gimpstrokeeditor.c:179
+#: ../app/widgets/gimpstrokeeditor.c:178
 msgid "Dash pattern:"
 msgstr "破線パターン:"
 
-#: ../app/widgets/gimpstrokeeditor.c:242
+#: ../app/widgets/gimpstrokeeditor.c:241
 msgid "Dash _preset:"
 msgstr "既定の破線(_P):"
 
@@ -16043,70 +17528,72 @@ msgstr "タグを付ける"
 msgid ","
 msgstr ","
 
-#: ../app/widgets/gimptemplateeditor.c:202
+#: ../app/widgets/gimptemplateeditor.c:201
 #, c-format
 msgid "%p"
 msgstr "%p"
 
-#: ../app/widgets/gimptemplateeditor.c:277
+#: ../app/widgets/gimptemplateeditor.c:276
 msgid "_Advanced Options"
 msgstr "詳細設定(_A)"
 
-#: ../app/widgets/gimptemplateeditor.c:388
+#: ../app/widgets/gimptemplateeditor.c:387
 msgid "Color _space:"
 msgstr "色空間(_S):"
 
-#: ../app/widgets/gimptemplateeditor.c:394
+#: ../app/widgets/gimptemplateeditor.c:393
 #, fuzzy
+#| msgid "Direction:"
 msgid "_Precision:"
 msgstr "方向:"
 
-#: ../app/widgets/gimptemplateeditor.c:402
+#: ../app/widgets/gimptemplateeditor.c:401
 msgid "_Fill with:"
 msgstr "塗りつぶし色(_F):"
 
-#: ../app/widgets/gimptemplateeditor.c:412
+#: ../app/widgets/gimptemplateeditor.c:411
 msgid "Comme_nt:"
 msgstr "コメント(_N):"
 
-#: ../app/widgets/gimptemplateeditor.c:519
+#: ../app/widgets/gimptemplateeditor.c:518
 msgid "_Name:"
 msgstr "名前(_N):"
 
-#: ../app/widgets/gimptemplateeditor.c:526
+#: ../app/widgets/gimptemplateeditor.c:524
 msgid "_Icon:"
 msgstr "アイコン(_I):"
 
-#: ../app/widgets/gimptemplateeditor.c:690
+#: ../app/widgets/gimptemplateeditor.c:688
 #, c-format
 msgid "%d × %d ppi, %s"
 msgstr "%d x %d dpi, %s"
 
-#: ../app/widgets/gimptemplateeditor.c:692
+#: ../app/widgets/gimptemplateeditor.c:690
 #, c-format
 msgid "%d ppi, %s"
 msgstr "%d dpi, %s"
 
-#: ../app/widgets/gimptextbuffer.c:1454
+#: ../app/widgets/gimptextbuffer.c:1453
 #, c-format
 msgid "Invalid UTF-8 data in file '%s'."
 msgstr "ファイル '%s' に無効な UTF-8 データがあります。"
 
-#: ../app/widgets/gimptextbuffer-serialize.c:340
+#: ../app/widgets/gimptextbuffer-serialize.c:351
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "テキスト中で使われている <%2$s> 要素の \"%1$s\" 属性は無効です。"
 
-#: ../app/widgets/gimptextbuffer-serialize.c:412
+#: ../app/widgets/gimptextbuffer-serialize.c:423
 #, c-format
 msgid "Outermost element in text must be <markup> not <%s>"
 msgstr "最も外側の要素は <%s> ではなく <markup> でなければいけません"
 
-#: ../app/widgets/gimptexteditor.c:222
+#: ../app/widgets/gimptexteditor.c:223
 msgid "_Use selected font"
 msgstr "アクティブなフォントで表示(_U)"
 
 #: ../app/widgets/gimptextstyleeditor.c:206
+#: ../app/widgets/gimptextstyleeditor.c:1315
 msgid "Change font of selected text"
 msgstr "選択したテキストのフォントを変更します"
 
@@ -16131,22 +17618,27 @@ msgstr "選択したテキストのカーニングを変更します"
 msgid "Change baseline of selected text"
 msgstr "選択したテキストのベースラインを変更します"
 
-#: ../app/widgets/gimptextstyleeditor.c:328
+#: ../app/widgets/gimptextstyleeditor.c:327
 msgid "Bold"
 msgstr "太字"
 
-#: ../app/widgets/gimptextstyleeditor.c:331
+#: ../app/widgets/gimptextstyleeditor.c:330
 msgid "Italic"
 msgstr "斜体"
 
-#: ../app/widgets/gimptextstyleeditor.c:334
+#: ../app/widgets/gimptextstyleeditor.c:333
 msgid "Underline"
 msgstr "下線"
 
-#: ../app/widgets/gimptextstyleeditor.c:337
+#: ../app/widgets/gimptextstyleeditor.c:336
 msgid "Strikethrough"
 msgstr "取り消し線"
 
+#: ../app/widgets/gimptextstyleeditor.c:1307
+#, c-format
+msgid "Font \"%s\" unavailable on this system"
+msgstr ""
+
 #: ../app/widgets/gimpthumbbox.c:331
 #, c-format
 msgid ""
@@ -16169,7 +17661,7 @@ msgstr "選択なし"
 msgid "Thumbnail %d of %d"
 msgstr "サムネイル %d/%d"
 
-#: ../app/widgets/gimpthumbbox.c:731 ../app/widgets/gimpthumbbox.c:741
+#: ../app/widgets/gimpthumbbox.c:738 ../app/widgets/gimpthumbbox.c:748
 msgid "Creating preview..."
 msgstr "プレビューを作成中..."
 
@@ -16248,88 +17740,86 @@ msgstr "このツールアイコンを最下段に移動します"
 msgid "Reset tool order and visibility"
 msgstr "ツールアイコンの 表示/非表示 と並び順をリセットします"
 
-#: ../app/widgets/gimptooloptionseditor.c:203
+#: ../app/widgets/gimptooloptionseditor.c:202
 msgid "Save Tool Preset..."
 msgstr "ツールプリセットの保存..."
 
-#: ../app/widgets/gimptooloptionseditor.c:211
+#: ../app/widgets/gimptooloptionseditor.c:210
 msgid "Restore Tool Preset..."
 msgstr "ツールプリセットの再読み込み..."
 
-#: ../app/widgets/gimptooloptionseditor.c:219
+#: ../app/widgets/gimptooloptionseditor.c:218
 msgid "Delete Tool Preset..."
 msgstr "ツールプリセットの削除..."
 
-#: ../app/widgets/gimptoolpreseteditor.c:149
+#: ../app/widgets/gimptoolpreseteditor.c:148
 msgid "Icon:"
 msgstr "アイコン:"
 
-#: ../app/widgets/gimptoolpreseteditor.c:160
+#: ../app/widgets/gimptoolpreseteditor.c:159
 msgid "Apply stored FG/BG"
 msgstr "描画色・背景色を適用"
 
-#: ../app/widgets/gimptoolpreseteditor.c:166
+#: ../app/widgets/gimptoolpreseteditor.c:165
 msgid "Apply stored brush"
 msgstr "ブラシを適用"
 
-#: ../app/widgets/gimptoolpreseteditor.c:172
+#: ../app/widgets/gimptoolpreseteditor.c:171
 msgid "Apply stored dynamics"
 msgstr "動的特性を適用"
 
-#: ../app/widgets/gimptoolpreseteditor.c:178
+#: ../app/widgets/gimptoolpreseteditor.c:177
 msgid "Apply stored gradient"
 msgstr "グラデーションを適用"
 
-#: ../app/widgets/gimptoolpreseteditor.c:184
+#: ../app/widgets/gimptoolpreseteditor.c:183
 msgid "Apply stored pattern"
 msgstr "パターンを適用"
 
-#: ../app/widgets/gimptoolpreseteditor.c:190
+#: ../app/widgets/gimptoolpreseteditor.c:189
 msgid "Apply stored palette"
 msgstr "パレットを適用"
 
-#: ../app/widgets/gimptoolpreseteditor.c:196
+#: ../app/widgets/gimptoolpreseteditor.c:195
 msgid "Apply stored font"
 msgstr "フォントを適用"
 
-#: ../app/widgets/gimptoolpreseteditor.c:293
+#: ../app/widgets/gimptoolpreseteditor.c:292
 #, c-format
 msgid "%s Preset"
 msgstr "%s のプリセット"
 
-#: ../app/widgets/gimptranslationstore.c:100
-msgid "System Language"
-msgstr "システム設定の言語"
-
-#: ../app/widgets/gimptranslationstore.c:102
-msgid "English"
-msgstr "英語"
-
-#: ../app/widgets/gimpuimanager.c:742
+#: ../app/widgets/gimpuimanager.c:741
 msgid "Your GIMP installation is incomplete:"
 msgstr "GIMP が正常にインストールされていません。"
 
-#: ../app/widgets/gimpuimanager.c:744
+#: ../app/widgets/gimpuimanager.c:743
 msgid "Please make sure the menu XML files are correctly installed."
 msgstr ""
 "メニューを定義する XML ファイルが正しくインストールされているか確認してくださ"
 "い。"
 
-#: ../app/widgets/gimpuimanager.c:750
+#: ../app/widgets/gimpuimanager.c:749
 #, c-format
 msgid "There was an error parsing the menu definition from %s: %s"
 msgstr ""
 "メニュー定義ファイル '%s' を解析するときにエラーが発生しました\n"
 "%s"
 
-#: ../app/widgets/gimpundoeditor.c:262
+#: ../app/widgets/gimpundoeditor.c:261
 msgid "[ Base Image ]"
 msgstr "[元画像]"
 
-#: ../app/widgets/gimpvectorstreeview.c:111
+#: ../app/widgets/gimpvectorstreeview.c:112
 msgid "Lock path strokes"
 msgstr "パスを保護"
 
+#: ../app/widgets/gimpvectorstreeview.c:115
+#, fuzzy
+#| msgid "Lock path strokes"
+msgid "Lock path position"
+msgstr "パスを保護"
+
 #: ../app/widgets/gimpviewablebox.c:88
 msgid "Open the brush selection dialog"
 msgstr "ブラシダイアログを開く"
@@ -16346,11 +17836,11 @@ msgstr "パターンダイアログを開く"
 msgid "Open the gradient selection dialog"
 msgstr "グラデーションダイアログを開く"
 
-#: ../app/widgets/gimpviewablebox.c:402
+#: ../app/widgets/gimpviewablebox.c:397
 msgid "Open the palette selection dialog"
 msgstr "パレットダイアログを開く"
 
-#: ../app/widgets/gimpviewablebox.c:467
+#: ../app/widgets/gimpviewablebox.c:462
 msgid "Open the font selection dialog"
 msgstr "フォントダイアログを開く"
 
@@ -16479,34 +17969,57 @@ msgctxt "tab-style"
 msgid "Undefined"
 msgstr "不定"
 
-#: ../app/xcf/xcf.c:100 ../app/xcf/xcf.c:168
+#: ../app/xcf/xcf.c:103 ../app/xcf/xcf.c:174
 msgid "GIMP XCF image"
 msgstr "GIMP XCF 画像"
 
-#: ../app/xcf/xcf.c:272
+#: ../app/xcf/xcf.c:282
 #, c-format
 msgid "Opening '%s'"
 msgstr "'%s' を開いています"
 
-#: ../app/xcf/xcf.c:314
+#: ../app/xcf/xcf.c:324
 #, c-format
 msgid "XCF error: unsupported XCF file version %d encountered"
 msgstr ""
 "XCF 形式のバージョンが適合しません。バージョン %d はサポートされていません。"
 
-#: ../app/xcf/xcf.c:384
+#: ../app/xcf/xcf.c:338
+#, fuzzy, c-format
+#| msgid "Could not open '%s' for reading: %s"
+msgid "Could not open '%s' for reading: "
+msgstr ""
+"'%s' を開いて読み込むことができません。\n"
+"%s"
+
+#: ../app/xcf/xcf.c:398
 #, c-format
 msgid "Saving '%s'"
 msgstr "'%s' を保存しています"
 
-#: ../app/xcf/xcf.c:404
-#, c-format
-msgid "Error saving XCF file: %s"
+#: ../app/xcf/xcf.c:418
+#, fuzzy, c-format
+#| msgid "Could not open '%s' for writing: %s"
+msgid "Could not open '%s' for writing: "
 msgstr ""
-"XCF ファイルの保存中にエラーが発生しました。\n"
+"'%s' を開いて書き込むことができません。\n"
 "%s"
 
-#: ../app/xcf/xcf-load.c:344
+#: ../app/xcf/xcf-load.c:267
+#, c-format
+msgid ""
+"Corrupt 'exif-data' parasite discovered.\n"
+"Exif data could not be migrated: %s"
+msgstr ""
+
+#: ../app/xcf/xcf-load.c:314
+#, c-format
+msgid ""
+"Corrupt 'gimp-metadata' parasite discovered.\n"
+"XMP data could not be migrated: %s"
+msgstr ""
+
+#: ../app/xcf/xcf-load.c:488
 msgid ""
 "This XCF file is corrupt!  I have loaded as much of it as I can, but it is "
 "incomplete."
@@ -16514,7 +18027,7 @@ msgstr ""
 "この XCF ファイルは壊れています。できる限り読み込みましたが、完全に読み込むこ"
 "とはできませんでした。"
 
-#: ../app/xcf/xcf-load.c:355
+#: ../app/xcf/xcf-load.c:499
 msgid ""
 "This XCF file is corrupt!  I could not even salvage any partial image data "
 "from it."
@@ -16522,7 +18035,7 @@ msgstr ""
 "この XCF ファイルは壊れています。このファイルからは画像データを部分的でさえ読"
 "み込むことができませんでした。"
 
-#: ../app/xcf/xcf-load.c:446
+#: ../app/xcf/xcf-load.c:591
 msgid ""
 "XCF warning: version 0 of XCF file format\n"
 "did not save indexed colormaps correctly.\n"
@@ -16532,20 +18045,22 @@ msgstr ""
 "カラーマップが正しく保存されていませんでした。\n"
 "グレースケールマップを仮定します。"
 
-#: ../app/xcf/xcf-read.c:115
+#: ../app/xcf/xcf-read.c:105
 msgid "Invalid UTF-8 string in XCF file"
 msgstr "XCF ファイル内に不適切な UTF-8 文字列があります"
 
-#: ../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"
+#: ../app/xcf/xcf-seek.c:44 ../app/xcf/xcf-seek.c:64
+#, fuzzy
+#| msgid "Could not seek in XCF file: %s"
+msgid "Could not seek in XCF file: "
 msgstr ""
 "XCF ファイルをシークできません。\n"
 "%s"
 
-#: ../app/xcf/xcf-write.c:86
-#, c-format
-msgid "Error writing XCF: %s"
+#: ../app/xcf/xcf-write.c:82
+#, fuzzy
+#| msgid "Error writing XCF: %s"
+msgid "Error writing XCF: "
 msgstr ""
 "XCF ファイルへの書き込み中にエラーが発生しました。\n"
 "%s"
@@ -16561,15 +18076,81 @@ msgstr "round"
 msgid "fuzzy"
 msgstr "fuzzy"
 
+#~ msgid ""
+#~ "Unable to open a test swap file.\n"
+#~ "\n"
+#~ "To avoid data loss, please check the location and permissions of the swap "
+#~ "directory defined in your Preferences (currently \"%s\")."
+#~ msgstr ""
+#~ "テストスワップファイルを開けません。\n"
+#~ "\n"
+#~ "現在設定されているスワップ用フォルダーの場所 (\"%s\") とパーミッションが正"
+#~ "しいか確認して、データ消失を防いでください。"
+
+#~ msgid "Configuration"
+#~ msgstr "設定"
+
+#~ msgctxt "config-action"
+#~ msgid "Use _GEGL"
+#~ msgstr "GEGL の利用(_G)"
+
+#~ msgctxt "config-action"
+#~ msgid "If possible, use GEGL for image processing"
+#~ msgstr "この設定をオンにすると、可能な限り GEGL を画像処理に使用します"
+
 #~ msgid "Equalize does not operate on indexed layers."
 #~ msgstr "インデックスレイヤーに対しては平均化処理をしません"
 
 #~ msgid "Invert does not operate on indexed layers."
 #~ msgstr "インデックスレイヤーに対しては反転操作をしません"
 
+#~ msgid "Crop Layer"
+#~ msgstr "レイヤーの切り抜き"
+
+#~ msgctxt "view-action"
+#~ msgid "Use GEGL"
+#~ msgstr "GEGL を使用"
+
+#~ msgctxt "view-action"
+#~ msgid "Use GEGL to create this window's projection"
+#~ msgstr "このウィンドウの投射に GEGL を使用します"
+
+#~ msgid ""
+#~ "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 ""
+#~ "スワップファイルを開けません。メモリが不足してもスワップファイルが使えなく"
+#~ "なります。画像の構成要素が欠ける可能性がありますので、現在のファイル名とは"
+#~ "異なる名前で作業中の画像を保存し GIMP を再起動してください。その後、設定ダ"
+#~ "イアログの [フォルダー] セクションでスワップ用フォルダーの場所を確認してく"
+#~ "ださい。"
+
+#~ msgid "Failed to resize swap file: %s"
+#~ msgstr ""
+#~ "スワップファイルのサイズ変更に失敗しました。\n"
+#~ "%s"
+
+#~ msgid "Ask for confirmation before closing an image without saving."
+#~ msgstr ""
+#~ "この設定がオンのときは、未保存の画像を閉じる前に保存の確認を行います。"
+
 #~ msgid "Hue_Saturation"
 #~ msgstr "色相-彩度(_S)"
 
+#~ msgid "Offset by  x/_2, y/2"
+#~ msgstr "オフセットを (x/_2) と (y/2) に"
+
+#~ msgid "Saving Images"
+#~ msgstr "画像の保存"
+
+#~ msgid "Confirm closing of unsa_ved images"
+#~ msgstr "未保存の画像を閉じるときに確認する(_V)"
+
+#~ msgid "Pointer re_ndering:"
+#~ msgstr "ポインターの表現方法(_N):"
+
 #~ msgid "Perspective Clone does not operate on indexed layers."
 #~ msgstr "インデックスレイヤーでは遠近スタンプは使えません"
 
@@ -16585,6 +18166,53 @@ msgstr "fuzzy"
 #~ msgid "Curves does not operate on indexed layers."
 #~ msgstr "インデックスレイヤーでは、トーンカーブは使用できません"
 
+#~ msgid "Select a single contiguous area"
+#~ msgstr "ひとかたまりの領域を抽出します"
+
+#~ msgid ""
+#~ "Smaller values give a more accurate selection border but may introduce "
+#~ "holes in the selection"
+#~ msgstr ""
+#~ "スムージングの値を設定します\n"
+#~ "値を小さくするとより正確に境界を判別しますが\n"
+#~ "抽出領域に穴ができる場合があります。"
+
+#~ msgid "Sensitivity for brightness component"
+#~ msgstr "明度への感度"
+
+#~ msgid "Sensitivity for red/green component"
+#~ msgstr "赤/緑への感度"
+
+#~ msgid "Sensitivity for yellow/blue component"
+#~ msgstr "黄/青への感度"
+
+#~ msgid "Contiguous"
+#~ msgstr "単一領域を抽出"
+
+#~ msgid "Interactive refinement  (%s)"
+#~ msgstr "抽出部分の修正(%s)"
+
+#~ msgid "Small brush"
+#~ msgstr "小さいブラシ"
+
+#~ msgid "Large brush"
+#~ msgstr "大きいブラシ"
+
+#~ msgid "Color Sensitivity"
+#~ msgstr "色感度"
+
+#~ msgid "Add more strokes or press Enter to accept the selection"
+#~ msgstr ""
+#~ "さらになぞって抽出部分を修正、または Enter/Return キーで選択範囲を確定しま"
+#~ "す"
+
+#~ msgid "Mark foreground by painting on the object to extract"
+#~ msgstr "抽出したい部分を塗って前景部分を指定します"
+
+#~ msgctxt "command"
+#~ msgid "Foreground Select"
+#~ msgstr "前景抽出選択"
+
 #~ msgid "GEGL operations do not operate on indexed layers."
 #~ msgstr "インデックスレイヤーでは GEGL を操作できません。"
 
@@ -16597,9 +18225,23 @@ msgstr "fuzzy"
 #~ msgid "Levels does not operate on indexed layers."
 #~ msgstr "インデックスレイヤーでは、レベルは使用できません"
 
+#~ msgid "Fixed:"
+#~ msgstr "値を固定"
+
 #~ msgid "Threshold does not operate on indexed layers."
 #~ msgstr "インデックスレイヤーにはしきい値操作はできません。"
 
+#~ msgid "English"
+#~ msgstr "英語"
+
+#~ msgid "Error saving XCF file: %s"
+#~ msgstr ""
+#~ "XCF ファイルの保存中にエラーが発生しました。\n"
+#~ "%s"
+
+#~ msgid "Close _without Saving"
+#~ msgstr "保存せずに閉じる(_W)"
+
 #~ msgctxt "undo-type"
 #~ msgid "Brightness_Contrast"
 #~ msgstr "明るさ-コントラスト(_C)"
@@ -16619,9 +18261,6 @@ msgstr "fuzzy"
 #~ msgid "Opacity:"
 #~ msgstr "不透明度:"
 
-#~ msgid "Set Item Exclusive Linked"
-#~ msgstr "アイテムを排他リンクにする"
-
 #~ msgctxt "tool-preset-action"
 #~ msgid "_Delete Tool Preset"
 #~ msgstr "ツールプリセットの削除(_D)"
@@ -16793,9 +18432,6 @@ msgstr "fuzzy"
 #~ msgid "Instant update"
 #~ msgstr "即時更新"
 
-#~ msgid "Length"
-#~ msgstr "長さ"
-
 #~ msgid "Type"
 #~ msgstr "種類"
 
@@ -16956,10 +18592,6 @@ msgstr "fuzzy"
 #~ msgstr "レイヤーの再配置"
 
 #~ msgctxt "undo-type"
-#~ msgid "Reposition channel"
-#~ msgstr "チャンネルの再配置"
-
-#~ msgctxt "undo-type"
 #~ msgid "Reposition path"
 #~ msgstr "パスの再配置"
 
@@ -17144,9 +18776,6 @@ msgstr "fuzzy"
 #~ msgid "Delete color"
 #~ msgstr "色の削除"
 
-#~ msgid "New palette"
-#~ msgstr "新規パレット"
-
 #~ msgid "New pattern"
 #~ msgstr "新しいパターンを作成します"
 
@@ -17354,9 +18983,6 @@ msgstr "fuzzy"
 #~ msgid "command|Rotate"
 #~ msgstr "回転"
 
-#~ msgid "command|Crop Image"
-#~ msgstr "画像の切り抜き"
-
 #~ msgid "dialog-title|Scale Image"
 #~ msgstr "画像の拡大縮小"
 
@@ -17557,9 +19183,6 @@ msgstr "fuzzy"
 #~ msgid "_Xtns"
 #~ msgstr "拡張(_X)"
 
-#~ msgid "Mode"
-#~ msgstr "モード"
-
 #~ msgid " "
 #~ msgstr " "
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]