[gimp-help-2] Rename autocrop image/layer to crop to content. Merge autocrop.xml with crop.xml to conform to gimp-

From: Julien Hardlin <jhardlin src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp-help-2] Rename autocrop image/layer to crop to content. Merge autocrop.xml with crop.xml to conform to gimp-
Date: Mon, 11 Sep 2017 05:53:29 +0000 (UTC)
commit 78a3a32e7ab38835d45097cfc08fc5fb94a0c6f0
Author: Julien Hardelin <jhardlin orange fr>
Date:   Mon Sep 11 07:52:42 2017 +0200

    Rename autocrop image/layer to crop to content. Merge autocrop.xml with crop.xml to conform to gimp-id's. 
Update French translation.

 po/fr/menus.po           |   11 +--
 po/fr/menus/image.po     |   92 +++++++++++++++++------
 po/fr/menus/layer.po     |  187 ++++++++++++++++++++++++++++------------------
 src/menus/image.xml      |    5 +-
 src/menus/image/crop.xml |  114 +++++++++++++++++++++++-----
 src/menus/layer.xml      |    3 +-
 src/menus/layer/crop.xml |  120 +++++++++++++++++++++++------
 7 files changed, 382 insertions(+), 150 deletions(-)
---
diff --git a/po/fr/menus.po b/po/fr/menus.po
index 6450604..a8a0f1e 100644
--- a/po/fr/menus.po
+++ b/po/fr/menus.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Manuel utilisateur de GIMP\n"
-"POT-Creation-Date: 2017-04-07 15:32+0200\n"
+"POT-Creation-Date: 2017-09-10 14:48+0200\n"
 "PO-Revision-Date: 2017-03-02 17:24+0100\n"
 "Last-Translator: Julien Hardelin <jhardlin orange fr>\n"
 "Language-Team: French <GNOME French Team <gnomefr traduc org>\n"
@@ -35,7 +35,7 @@ msgid "<quote>Windows</quote> Menu"
 msgstr "Le menu <quote>Fenêtres</quote>"
 
 #: src/menus/windows.xml:15(primary) src/menus/select.xml:12(primary)
-#: src/menus/image.xml:17(secondary) src/menus/colors.xml:22(secondary)
+#: src/menus/image.xml:16(secondary) src/menus/colors.xml:22(secondary)
 #: src/menus/view.xml:14(secondary) src/menus/tools.xml:14(primary)
 #: src/menus/filters.xml:15(primary) src/menus/edit.xml:17(primary)
 #: src/menus/introduction.xml:14(primary) src/menus/file.xml:19(primary)
@@ -252,11 +252,11 @@ msgstr ""
 "greffons (plug-ins). Vous trouverez leur description dans la documentation "
 "du greffon correspondant."
 
-#: src/menus/image.xml:13(title)
+#: src/menus/image.xml:12(title)
 msgid "The <quote>Image</quote> Menu"
 msgstr "Le menu <quote>Image</quote>"
 
-#: src/menus/image.xml:16(primary) src/menus/colors.xml:21(primary)
+#: src/menus/image.xml:15(primary) src/menus/colors.xml:21(primary)
 #: src/menus/view.xml:13(primary)
 msgid "Image window"
 msgstr "Fenêtres d'image"
@@ -625,7 +625,7 @@ msgstr ""
 "<menuchoice><guimenu>Fenêtres</guimenu><guimenuitem>Groupes de fenêtres "
 "récemment fermés</guimenuitem></menuchoice>"
 
-#: src/menus/layer.xml:11(title)
+#: src/menus/layer.xml:12(title)
 msgid "The <quote>Layer</quote> Menu"
 msgstr "Le menu <quote>Calque</quote>"
 
@@ -633,4 +633,3 @@ msgstr "Le menu <quote>Calque</quote>"
 #: src/menus/layer.xml:0(None)
 msgid "translator-credits"
 msgstr "Julien Hardelin, jhardlin{AT}wanadoo{POINT}fr, 2008, 2009, 2010, 2012"
-
diff --git a/po/fr/menus/image.po b/po/fr/menus/image.po
index aacb0b9..edf9815 100644
--- a/po/fr/menus/image.po
+++ b/po/fr/menus/image.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Manuel utilisateur de GIMP-2.8\n"
-"POT-Creation-Date: 2017-06-07 20:34+0200\n"
-"PO-Revision-Date: 2017-06-10 14:59+0200\n"
+"POT-Creation-Date: 2017-09-10 14:48+0200\n"
+"PO-Revision-Date: 2017-09-10 17:53+0200\n"
 "Last-Translator: Julien Hardelin <jhardlin orange fr>\n"
 "Language-Team: French <GNOME French Team <gnomefr traduc org>\n"
 "Language: fr\n"
@@ -104,7 +104,8 @@ msgstr "Convertir en profil de couleurs"
 #: src/menus/image/assign-color-profile.xml:11(primary)
 #: src/menus/image/zealous-crop.xml:15(primary)
 #: src/menus/image/introduction.xml:14(secondary)
-#: src/menus/image/crop.xml:15(primary) src/menus/image/mode.xml:18(primary)
+#: src/menus/image/crop.xml:11(primary) src/menus/image/crop.xml:20(primary)
+#: src/menus/image/mode.xml:18(primary)
 #: src/menus/image/transform-guillotine.xml:14(primary)
 msgid "Image"
 msgstr "Image"
@@ -1750,7 +1751,7 @@ msgstr ""
 
 #: src/menus/image/fit-canvas-to-layers.xml:33(title)
 #: src/menus/image/fit-canvas-to-selection.xml:24(title)
-#: src/menus/image/crop.xml:41(title)
+#: src/menus/image/crop.xml:115(title)
 msgid "Activate the command"
 msgstr "Accès à la commande"
 
@@ -3730,7 +3731,7 @@ msgstr "À FAIRE"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/image/autocrop.xml:59(None)
+#: src/menus/image/autocrop.xml:59(None) src/menus/image/crop.xml:87(None)
 msgid ""
 "@@image: 'images/menus/image/autocrop-1.png'; "
 "md5=830605c6b6332ff5b4c21d71fde6f442"
@@ -3738,7 +3739,7 @@ msgstr " "
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/image/autocrop.xml:72(None)
+#: src/menus/image/autocrop.xml:72(None) src/menus/image/crop.xml:100(None)
 msgid ""
 "@@image: 'images/menus/image/autocrop-2.png'; "
 "md5=bf28a4a165d37f1a40b2058465352dfe"
@@ -3750,7 +3751,8 @@ msgstr "Découpage automatique de l'image"
 
 #: src/menus/image/autocrop.xml:14(secondary)
 #: src/menus/image/zealous-crop.xml:16(secondary)
-#: src/menus/image/crop.xml:16(secondary)
+#: src/menus/image/crop.xml:12(secondary)
+#: src/menus/image/crop.xml:21(secondary)
 msgid "Crop"
 msgstr "Découpage"
 
@@ -3772,7 +3774,7 @@ msgstr ""
 "recherche de la plus large bordure possible de la même couleur et la "
 "supprime."
 
-#: src/menus/image/autocrop.xml:29(para)
+#: src/menus/image/autocrop.xml:29(para) src/menus/image/crop.xml:75(para)
 msgid ""
 "Note carefully that this command only uses the <emphasis>active layer</"
 "emphasis> of the image to find borders. Other layers are cropped according "
@@ -3797,7 +3799,7 @@ msgstr ""
 msgid "<quote>Autocrop</quote> example"
 msgstr "Exemple de <quote>Découpage automatique</quote>"
 
-#: src/menus/image/autocrop.xml:62(para)
+#: src/menus/image/autocrop.xml:62(para) src/menus/image/crop.xml:90(para)
 msgid ""
 "This image is made of three layers. One with a red square, another with a "
 "green square; both on a yellow semi-transparent background. The green layer "
@@ -4643,19 +4645,33 @@ msgstr ""
 "entière et non pas seulement le calque actif ou une quelconque partie de "
 "l'image."
 
-#: src/menus/image/crop.xml:12(title)
-msgid "Crop to Selection"
-msgstr "Découper la sélection"
+#: src/menus/image/crop.xml:8(title)
+msgid "Crop Image"
+msgstr "Rogner l'image"
 
-#: src/menus/image/crop.xml:17(tertiary)
+#: src/menus/image/crop.xml:13(tertiary)
 msgid "To selection"
-msgstr "Découper la sélection"
+msgstr "selon la sélection"
 
-#: src/menus/image/crop.xml:20(primary)
+#: src/menus/image/crop.xml:16(primary) src/menus/image/crop.xml:32(para)
+#: src/menus/image/crop.xml:45(title)
 msgid "Crop to selection"
-msgstr "Découper la sélection"
+msgstr "Rogner selon la sélection"
 
-#: src/menus/image/crop.xml:23(para)
+#: src/menus/image/crop.xml:22(tertiary)
+msgid "To content"
+msgstr "selon le contenu"
+
+#: src/menus/image/crop.xml:25(primary) src/menus/image/crop.xml:37(para)
+#: src/menus/image/crop.xml:65(title)
+msgid "Crop to content"
+msgstr "Rogner selon le contenu"
+
+#: src/menus/image/crop.xml:28(para)
+msgid "You can crop image in two ways: <placeholder-1/>"
+msgstr "Vous pouvez rognez une image de deux façons : <placeholder-1/>"
+
+#: src/menus/image/crop.xml:46(para)
 msgid ""
 "The <guimenuitem>Crop to Selection</guimenuitem> command crops the image to "
 "the boundary of the selection by removing any strips at the edges whose "
@@ -4665,22 +4681,52 @@ msgid ""
 "area. If there is no selection for the image, the menu entry is disabled and "
 "grayed out."
 msgstr ""
-"Cette commande rogne l'image suivant le contour délimité par la sélection. "
+"La commande <guimenuitem>Rogner selon la sélection</guimenuitem> rogne " 
+"l'image suivant le contour délimité par la sélection. "
 "Les régions qui sont partiellement sélectionnées (à cause d'un adoucissement "
 "des bords) ne sont pas découpées. Dans le cas d'une sélection adoucie, le "
 "découpage se fera sur la limite extérieure de l'adoucissement. S'il n'y a "
 "aucune sélection présente, l'entrée de menu sera désactivée (en grisé)."
 
-#: src/menus/image/crop.xml:33(para)
+#: src/menus/image/crop.xml:56(para)
 msgid ""
-"This command crops all of the image layers. To crop just the active layer, "
+"This command crops all of the image layers. To crop the active layer only, "
 "use the <link linkend=\"gimp-layer-crop\">Crop Layer</link> command."
 msgstr ""
 "Cette commande agit sur l'ensemble des calques de l'image. Pour n'agir que "
-"sur un seul calque, utilisez <link linkend=\"gimp-layer-crop\">Découper les "
-"bords du calque</link>"
+"sur un seul calque, utilisez <link linkend=\"gimp-layer-crop\">Rogner le "
+"calque</link>"
+
+#: src/menus/image/crop.xml:66(para)
+msgid ""
+"Before GIMP-2.10, this command was named <quote>Autocrop image</quote>. The "
+"<guimenuitem>Crop to content</guimenuitem> command removes the borders from "
+"an image. It searches the active layer for the largest possible border area "
+"that is all the same color, and then crops this area from the image, as if "
+"you had used the <link linkend=\"gimp-tool-crop\">Crop</link> tool."
+msgstr ""
+"Cette fonction automatise le Découpage de l'image, à la différence de <link "
+"linkend=\"gimp-tool-crop\">l'outil Découpage</link> qui vous permet de "
+"définir manuellement la zone à découper. Elle explore le calque actif à la "
+"recherche de la plus large bordure possible de la même couleur et la "
+"supprime."
+
+#: src/menus/image/crop.xml:83(title)
+msgid "<quote>Crop to content</quote> example"
+msgstr "Exemple de <quote>Rogner selon le contenu</quote>"
+
+#: src/menus/image/crop.xml:103(para)
+msgid ""
+"<quote>Crop to content</quote> has cropped the green square and made a layer "
+"from it. The other layers have been cropped to the same size as the green "
+"one. Only a small part of the red square has been kept."
+msgstr ""
+"<quote>Rogner selon le contenu</quote> a découpé le carré vert et en a fait "
+"un "
+"calque. Les autres calques ont été découpés aux dimensions de ce dernier ; "
+"seule une petite partie du calque rouge a été retenue."
 
-#: src/menus/image/crop.xml:44(para)
+#: src/menus/image/crop.xml:118(para)
 msgid ""
 "You can access this command on the image menu bar through "
 "<menuchoice><guimenu>Image</guimenu><guimenuitem>Crop to Selection</"
diff --git a/po/fr/menus/layer.po b/po/fr/menus/layer.po
index abf7a74..d08b7c7 100644
--- a/po/fr/menus/layer.po
+++ b/po/fr/menus/layer.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Manuel utilisateur de GIMP\n"
-"POT-Creation-Date: 2017-02-02 15:18+0100\n"
-"PO-Revision-Date: 2017-02-02 15:41+0100\n"
+"POT-Creation-Date: 2017-09-10 17:44+0200\n"
+"PO-Revision-Date: 2017-09-10 18:00+0200\n"
 "Last-Translator: Julien Hardelin <jhardlin orange fr>\n"
 "Language-Team: French <GNOME French Team <gnomefr traduc org>\n"
 "Language: fr_FR\n"
@@ -50,7 +50,7 @@ msgstr "Nouveau calque"
 #: src/menus/layer/rotate-270.xml:14(primary)
 #: src/menus/layer/rotate-arbitrary.xml:13(primary)
 #: src/menus/layer/threshold-alpha.xml:13(primary)
-#: src/menus/layer/crop.xml:15(primary)
+#: src/menus/layer/crop.xml:12(primary) src/menus/layer/crop.xml:21(primary)
 #: src/menus/layer/alpha-selection-intersect.xml:17(primary)
 #: src/menus/layer/mask-edit.xml:13(primary)
 #: src/menus/layer/autocrop.xml:16(primary)
@@ -131,7 +131,7 @@ msgstr ""
 #: src/menus/layer/rotate-270.xml:34(title)
 #: src/menus/layer/rotate-arbitrary.xml:29(title)
 #: src/menus/layer/threshold-alpha.xml:33(title)
-#: src/menus/layer/crop.xml:33(title) src/menus/layer/mask-edit.xml:37(title)
+#: src/menus/layer/crop.xml:126(title) src/menus/layer/mask-edit.xml:37(title)
 #: src/menus/layer/autocrop.xml:44(title)
 #: src/menus/layer/merge-down.xml:44(title)
 #: src/menus/layer/flip-horizontal.xml:29(title)
@@ -509,7 +509,6 @@ msgstr ""
 #: src/menus/layer/offset.xml:134(title)
 #: src/menus/layer/rotate-270.xml:49(title)
 #: src/menus/layer/rotate-arbitrary.xml:50(title)
-#: src/menus/layer/crop.xml:48(title)
 #: src/menus/layer/alpha-selection-intersect.xml:58(title)
 #: src/menus/layer/autocrop.xml:59(title)
 #: src/menus/layer/autocrop.xml:61(title)
@@ -569,8 +568,8 @@ msgid ""
 "\"gimp-filter-color-to-alpha\"/>."
 msgstr ""
 "Cette commande est la même que <menuchoice><guimenu>Calque</"
-"guimenu><guisubmenu>Transparence</guisubmenu></menuchoice> : <xref "
-"linkend=\"gimp-filter-color-to-alpha\"/>."
+"guimenu><guisubmenu>Transparence</guisubmenu></menuchoice> : <xref linkend="
+"\"gimp-filter-color-to-alpha\"/>."
 
 #: src/menus/layer/lower-to-bottom.xml:10(title)
 msgid "Layer to Bottom"
@@ -1009,7 +1008,8 @@ msgid "Layer to Image Size"
 msgstr "Calque aux dimensions de l'image"
 
 #: src/menus/layer/resize-to-image.xml:13(secondary)
-#: src/menus/layer/crop.xml:16(secondary)
+#: src/menus/layer/crop.xml:13(secondary)
+#: src/menus/layer/crop.xml:22(secondary)
 #: src/menus/layer/autocrop.xml:17(secondary)
 #: src/menus/layer/scale.xml:16(secondary)
 #: src/menus/layer/resize.xml:13(secondary)
@@ -1857,24 +1857,49 @@ msgstr "Seuil alpha fixé à 50, 127, 210"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/layer/crop.xml:53(None)
+#: src/menus/layer/crop.xml:59(None)
 msgid ""
 "@@image: 'images/menus/layer/crop.png'; md5=a85dcee6a55ea3e1e21bfb2a2aced52e"
 msgstr " "
 
-#: src/menus/layer/crop.xml:12(title)
-msgid "Crop to Selection"
-msgstr "Découper la sélection"
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: src/menus/layer/crop.xml:99(None) src/menus/layer/autocrop.xml:65(None)
+msgid ""
+"@@image: 'images/menus/layer/autocrop-1.png'; "
+"md5=793239d9e31b65014ea1e4684a0bc84d"
+msgstr " "
 
-#: src/menus/layer/crop.xml:17(tertiary)
-msgid "Crop according to selection"
-msgstr "Découper selon la sélection"
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: src/menus/layer/crop.xml:110(None) src/menus/layer/autocrop.xml:76(None)
+msgid ""
+"@@image: 'images/menus/layer/autocrop-2.png'; "
+"md5=472abe2ebb667213befd2e87ab3a01d0"
+msgstr " "
 
-#: src/menus/layer/crop.xml:20(primary)
+#: src/menus/layer/crop.xml:9(title) src/menus/layer/crop.xml:17(primary)
 msgid "Crop Layer"
-msgstr "Découper le calque"
+msgstr "Rogner le calque"
+
+#: src/menus/layer/crop.xml:14(tertiary)
+msgid "Crop according to selection"
+msgstr "Rogner selon la sélection"
+
+#: src/menus/layer/crop.xml:23(tertiary) src/menus/layer/crop.xml:26(primary)
+#: src/menus/layer/crop.xml:38(para) src/menus/layer/crop.xml:76(title)
+msgid "Crop to content"
+msgstr "Rogner selon le contenu"
+
+#: src/menus/layer/crop.xml:33(para) src/menus/layer/crop.xml:46(title)
+msgid "Crop to selection"
+msgstr "Rogner selon la sélection"
+
+#: src/menus/layer/crop.xml:29(para)
+msgid "You can crop layer in two ways: <placeholder-1/>"
+msgstr "Vous pouvez rogner le calque de deux façons : <placeholder-1/>"
 
-#: src/menus/layer/crop.xml:23(para)
+#: src/menus/layer/crop.xml:47(para)
 msgid ""
 "The <guimenuitem>Crop to Selection</guimenuitem> command crops only the "
 "active layer to the boundary of the selection by removing any strips at the "
@@ -1887,26 +1912,17 @@ msgstr ""
 "l'adoucissement) ne sont pas découpées. S'il n'y a aucune sélection "
 "présente, l'entrée de menu sera désactivée (en grisé)."
 
-#: src/menus/layer/crop.xml:36(para)
-msgid ""
-"You can access this command from the image menubar through "
-"<menuchoice><guimenu>Layer</guimenu><guimenuitem>Crop to Selection</"
-"guimenuitem></menuchoice>."
-msgstr ""
-"Vous le trouverez dans <menuchoice><guimenu>Calque</"
-"guimenu><guimenuitem>Découper la sélection</guimenuitem></menuchoice>."
-
-#: src/menus/layer/crop.xml:50(title)
+#: src/menus/layer/crop.xml:56(title)
 msgid "Applying <quote>Crop to Selection</quote>"
-msgstr "Application de <quote>Découper la sélection</quote>"
+msgstr "Application de <quote>Rogner selon la sélection</quote>"
 
-#: src/menus/layer/crop.xml:56(para)
+#: src/menus/layer/crop.xml:62(para)
 msgid ""
 "On the left: before applying the command, the layer has a selection that has "
 "feathered edges."
 msgstr "À gauche, un calque avec une sélection aux bords adoucis."
 
-#: src/menus/layer/crop.xml:60(para)
+#: src/menus/layer/crop.xml:66(para)
 msgid ""
 "On the right: after applying the command, the non-transparent pixels are not "
 "cropped, even if they are only semi-transparent."
@@ -1914,6 +1930,69 @@ msgstr ""
 "À droite, après application de la commande: le découpage s'arrête aux pixels "
 "non transparents, même partiellement."
 
+#: src/menus/layer/crop.xml:77(para)
+msgid ""
+"The <guimenuitem>Crop to content</guimenuitem> command automatically crops "
+"the active layer, unlike the <link linkend=\"gimp-tool-crop\">Crop Tool</"
+"link>, or the <link linkend=\"crop-layer-to-selection\">Crop to Selection</"
+"link> command which let you manually define the area to be cropped."
+msgstr ""
+"La fonction  <guimenuitem>Rogner selon le contenu</guimenuitem>automatise le "
+"découpage du calque actif, à la différence de "
+"<link linkend=\"gimp-tool-crop\">l'outil Découpage</link> ou la commande "
+"<link linkend=\"crop-layer-to-selection\">Rogner selon la sélection</link> "
+"qui "
+"vous permettent de définir manuellement la zone à découper."
+
+#: src/menus/layer/crop.xml:84(para) src/menus/layer/autocrop.xml:32(para)
+msgid ""
+"This command removes the largest possible area around the outside edge which "
+"all has the same color. It does this by scanning the layer along a "
+"horizontal line and a vertical line and cropping the layer as soon as it "
+"encounters a different color, whatever its transparency."
+msgstr ""
+"La commande scanne le calque selon une ligne horizontale et une ligne "
+"verticale et découpe le calque dès qu'elle rencontre une couleur différente, "
+"quelle que soit sa transparence."
+
+#: src/menus/layer/crop.xml:90(para) src/menus/layer/autocrop.xml:38(para)
+msgid ""
+"You can use this command to crop the layer to the dimensions of a subject "
+"that is lost in a solid background which is too large."
+msgstr ""
+"Elle est en fait à réserver au cas où vous avez un sujet perdu dans un fond "
+"uni trop grand : le calque sera recadré aux dimensions du sujet."
+
+#: src/menus/layer/crop.xml:95(title)
+msgid "<quote>Crop to content</quote> example"
+msgstr "Exemple de <quote>Rogner selon le contenu</quote>"
+
+#: src/menus/layer/crop.xml:102(para)
+msgid "Before applying <quote>Crop to content</quote>"
+msgstr "Avant application de <quote>Rogner selon le contenu</quote>"
+
+#: src/menus/layer/crop.xml:113(para)
+msgid ""
+"After applying <quote>Crop to content</quote>: the active layer, up, has "
+"been cropped to the size of the circle it contains. Its size is reduced, and "
+"the unoccupied part in the canvas is transparent, revealing the yellow and "
+"green colors of the underlying layer."
+msgstr ""
+"Après application de <quote>Rogner selon le contenu</quote> : le "
+"calque actif, situé en haut, a été découpé à la taille du cercle qu'il "
+"contient. Sa taille est réduite et la partie qu'il n'occupe pas dans le "
+"canevas est transparente, laissant voir le jaune et le vert du calque sous-"
+"jacent."
+
+#: src/menus/layer/crop.xml:129(para)
+msgid ""
+"You can access this command from the image menubar through "
+"<menuchoice><guimenu>Layer</guimenu><guimenuitem>Crop to Selection</"
+"guimenuitem></menuchoice>."
+msgstr ""
+"Vous le trouverez dans <menuchoice><guimenu>Calque</"
+"guimenu><guimenuitem>Rogner selon la sélection</guimenuitem></menuchoice>."
+
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: src/menus/layer/alpha-selection-intersect.xml:63(None)
@@ -2040,22 +2119,6 @@ msgstr ""
 "Calque/Masque ou en cliquant sur la vignette du composant image dans le "
 "Dialogue des calques."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/layer/autocrop.xml:65(None)
-msgid ""
-"@@image: 'images/menus/layer/autocrop-1.png'; "
-"md5=793239d9e31b65014ea1e4684a0bc84d"
-msgstr " "
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/layer/autocrop.xml:76(None)
-msgid ""
-"@@image: 'images/menus/layer/autocrop-2.png'; "
-"md5=472abe2ebb667213befd2e87ab3a01d0"
-msgstr " "
-
 #: src/menus/layer/autocrop.xml:13(title)
 msgid "Autocrop Layer"
 msgstr "Découpage automatique du calque"
@@ -2084,25 +2147,6 @@ msgstr ""
 "<link linkend=\"gimp-layer-crop\">Découper les bords du calque</link> qui "
 "vous permettent de définir manuellement la zone à découper."
 
-#: src/menus/layer/autocrop.xml:32(para)
-msgid ""
-"This command removes the largest possible area around the outside edge which "
-"all has the same color. It does this by scanning the layer along a "
-"horizontal line and a vertical line and cropping the layer as soon as it "
-"encounters a different color, whatever its transparency."
-msgstr ""
-"La commande scanne le calque selon une ligne horizontale et une ligne "
-"verticale et découpe le calque dès qu'elle rencontre une couleur différente, "
-"quelle que soit sa transparence."
-
-#: src/menus/layer/autocrop.xml:38(para)
-msgid ""
-"You can use this command to crop the layer to the dimensions of a subject "
-"that is lost in a solid background which is too large."
-msgstr ""
-"Elle est en fait à réserver au cas où vous avez un sujet perdu dans un fond "
-"uni trop grand : le calque sera recadré aux dimensions du sujet."
-
 #: src/menus/layer/autocrop.xml:47(para)
 msgid ""
 "You can access this command from the image menubar through "
@@ -2281,11 +2325,9 @@ msgid ""
 "chapter. The command is useful when you need an anti-aliased image with "
 "indexed colors and transparency."
 msgstr ""
-"Cette commande est décrite avec le filtre <link "
-"linkend=\"gimp-filter-semi-flatten"
-"\">Aplatir à moité</link>. Elle est utile quand vous avez besoin d'une "
-"bordure "
-"adoucie dans une image en couleurs indexées et transparence."
+"Cette commande est décrite avec le filtre <link linkend=\"gimp-filter-semi-"
+"flatten\">Aplatir à moité</link>. Elle est utile quand vous avez besoin "
+"d'une bordure adoucie dans une image en couleurs indexées et transparence."
 
 #: src/menus/layer/alpha-semi-flatten.xml:36(para)
 msgid ""
@@ -2295,8 +2337,7 @@ msgid ""
 msgstr ""
 "On accède à cette commande depuis le menu de fenêtre d'image "
 "<menuchoice><guimenu>Calque</guimenu><guisubmenu>Transparence</"
-"guisubmenu><guimenuitem>Aplatir à moitié…</guimenuitem></"
-"menuchoice>."
+"guisubmenu><guimenuitem>Aplatir à moitié…</guimenuitem></menuchoice>."
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
diff --git a/src/menus/image.xml b/src/menus/image.xml
index 139b16c..c6b95cd 100644
--- a/src/menus/image.xml
+++ b/src/menus/image.xml
@@ -2,12 +2,11 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--section history:
+  2017-09-09 j.h: merge autocrop.xml (now named crop to content) with crop.xml
   2017-04-02 elle stone: update separators, add files and placeholder
                          files for the color management menu
   2009-01-24 ude: moved files to new subdir "menus/image/"
   2009-01-19 j.h: added fit-canvas-to-selection.xml
-  2007-03-25 re-ordered xi:includes
-  2005-10-24 split intro off by axel.wernicke
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-image-menu">
   <title>The <quote>Image</quote> Menu</title>
@@ -44,7 +43,7 @@
   <xi:include href="image/scale.xml"/>
   <!-- separator -->
   <xi:include href="image/crop.xml"/>
-  <xi:include href="image/autocrop.xml"/>
+  <!--<xi:include href="image/autocrop.xml"/>-->
   <xi:include href="image/zealous-crop.xml"/>
   <!-- separator -->
   <xi:include href="image/merge-layers.xml"/>
diff --git a/src/menus/image/crop.xml b/src/menus/image/crop.xml
index 7ff494f..76726dd 100644
--- a/src/menus/image/crop.xml
+++ b/src/menus/image/crop.xml
@@ -2,14 +2,10 @@
 <!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
-  2007-11-24 j.h: updated to v2.4
-  2007-09-26 AntI: Added 'es'
-  2007-03-08 alex falappa: added it translation
-  2007-08-01 scb: revised 'en'
-  2006-07-29 lexa: patch from julien that includes suggestions by Sally
+  2017-09-09 j.h update v2.10
 -->
 <sect2 id="gimp-image-crop">
-  <title>Crop to Selection</title>
+  <title>Crop Image</title>
 
   <indexterm>
     <primary>Image</primary>
@@ -19,24 +15,102 @@
   <indexterm>
     <primary>Crop to selection</primary>
   </indexterm>
-
+  
+  <indexterm>
+    <primary>Image</primary>
+    <secondary>Crop</secondary>
+    <tertiary>To content</tertiary>
+  </indexterm>
+  <indexterm>
+    <primary>Crop to content</primary>
+  </indexterm>
+  
   <para>
-    The <guimenuitem>Crop to Selection</guimenuitem> command crops the image to
-    the boundary of the selection by removing any strips at the edges whose
-    contents are all completely unselected. Areas which are partially
-    selected (for example, by feathering) are not cropped. If the selection
-    has been feathered, cropping is performed on the external limit of the
-    feathered area. If there is no selection for the image, the menu entry is
-    disabled and grayed out.
+    You can crop image in two ways:
+    <itemizedlist>
+      <listitem>
+        <para>
+          Crop to selection
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Crop to content
+        </para>
+      </listitem>
+    </itemizedlist>
   </para>
-  <note>
+
+  <sect3 id="crop-image-to-selection">
+    <title>Crop to selection</title>
     <para>
-      This command crops all of the image layers. To crop just the active
-      layer, use the <link linkend="gimp-layer-crop">Crop Layer</link>
-      command.
+      The <guimenuitem>Crop to Selection</guimenuitem> command crops the image 
+      to the boundary of the selection by removing any strips at the edges 
+      whose contents are all completely unselected. Areas which are 
+      partially selected (for example, by feathering) are not cropped. If 
+      the selection has been feathered, cropping is performed on the 
+      external limit of the feathered area. If there is no selection for 
+      the image, the menu entry is disabled and grayed out.
     </para>
-  </note>
-
+    <note>
+      <para>
+        This command crops all of the image layers. To crop the active layer 
+        only, use the <link linkend="crop-layer-to-selection">Crop to 
+        selection</link> command.
+      </para>
+    </note>
+  </sect3>
+  
+  <sect3 id="crop-image-to-content">
+    <title>Crop to content</title>
+    <para>
+      Before GIMP-2.10, this command was named <quote>Autocrop image</quote>. 
+      The <guimenuitem>Crop to content</guimenuitem> command removes the
+      borders from an image. It searches the active layer for the largest
+      possible border area that is all the same color, and then crops this
+      area from the image, as if you had used the
+      <link linkend="gimp-tool-crop">Crop</link> tool.
+    </para>
+    <caution>
+      <para>
+        Note carefully that this command only uses the
+        <emphasis>active layer</emphasis> of the image to find borders. 
+        Other layers are cropped according to the same limits as limits in 
+        the active layer.
+      </para>
+    </caution>
+    <figure>
+      <title><quote>Crop to content</quote> example</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata format="PNG"
+            fileref="images/menus/image/autocrop-1.png"/>
+        </imageobject>
+        <caption>
+          <para>
+            This image is made of three layers. One with a red square,
+            another with a green square; both on a yellow semi-transparent
+            background. The green layer is active.
+          </para>
+        </caption>
+      </mediaobject>
+      <mediaobject>
+        <imageobject>
+          <imagedata format="PNG"
+            fileref="images/menus/image/autocrop-2.png"/>
+        </imageobject>
+        <caption>
+          <para>
+            <quote>Crop to content</quote> has cropped the green square and 
+            made a layer from it. The other layers have been cropped to the 
+            same size as the green one. Only a small part of the red square has
+            been kept.
+          </para>
+        </caption>
+      </mediaobject>
+    </figure>
+  </sect3>
+  
   <sect3>
     <title>Activate the command</title>
     <itemizedlist>
diff --git a/src/menus/layer.xml b/src/menus/layer.xml
index a344609..ca2d996 100644
--- a/src/menus/layer.xml
+++ b/src/menus/layer.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2017-09-09 j.h: merge autocrop.xml (now named crop to content) with crop.xml
   2012-06-10 j.h: add new-layer-group.xml
   2009-01-28 j.h: added new-from-visible.xml
   2009-01-24 ude: moved files to new subdir "menus/layer/"
@@ -66,5 +67,5 @@
   <xi:include href="layer/resize-to-image.xml"/>
   <xi:include href="layer/scale.xml"/>
   <xi:include href="layer/crop.xml"/>
-  <xi:include href="layer/autocrop.xml"/>
+  <!--<xi:include href="layer/autocrop.xml"/>-->
 </sect1>
diff --git a/src/menus/layer/crop.xml b/src/menus/layer/crop.xml
index 07bab1a..17d6ff6 100644
--- a/src/menus/layer/crop.xml
+++ b/src/menus/layer/crop.xml
@@ -2,14 +2,11 @@
 <!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
-  2007-12-04 j.h: updated to v2.4 : name has changed
-  2007-06-11 Added Spanish translation by AntI
-  2007-03-12 Kolbjørn: added no translation
+  
   2006-08-03 scb: revised 'en'
-  2005/11/19 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-layer-crop">
-  <title>Crop to Selection</title>
+  <title>Crop Layer</title>
 
   <indexterm>
     <primary>Layer</primary>
@@ -19,33 +16,42 @@
   <indexterm>
     <primary>Crop Layer</primary>
   </indexterm>
-
+  
+  <indexterm>
+    <primary>Layer</primary>
+    <secondary>Size managing</secondary>
+    <tertiary>Crop to content</tertiary>
+  </indexterm>
+  <indexterm>
+    <primary>Crop to content</primary>
+  </indexterm>
+  
   <para>
-    The <guimenuitem>Crop to Selection</guimenuitem> command crops only the
-    active layer to the boundary of the selection by removing any strips
-    at the edge whose contents are all completely unselected. Areas which
-    are partially selected (for example, by feathering) are not cropped.
-    If there is no selection for the image, the menu entry is insensitive
-    and grayed out.
-  </para>
-
-  <sect3>
-    <title>Activating the Command</title>
+    You can crop layer in two ways:
     <itemizedlist>
       <listitem>
         <para>
-          You can access this command from the image menubar through
-          <menuchoice>
-            <guimenu>Layer</guimenu>
-            <guimenuitem>Crop to Selection</guimenuitem>
-          </menuchoice>.
+          Crop to selection
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Crop to content
         </para>
       </listitem>
     </itemizedlist>
-  </sect3>
+  </para>
 
-  <sect3>
-    <title>Example</title>
+  <sect3 id="crop-layer-to-selection">
+    <title>Crop to selection</title>
+    <para>
+      The <guimenuitem>Crop to Selection</guimenuitem> command crops only the
+      active layer to the boundary of the selection by removing any strips
+      at the edge whose contents are all completely unselected. Areas which
+      are partially selected (for example, by feathering) are not cropped.
+      If there is no selection for the image, the menu entry is insensitive
+      and grayed out.
+    </para>
     <figure>
       <title>Applying <quote>Crop to Selection</quote></title>
       <mediaobject>
@@ -65,4 +71,70 @@
       </mediaobject>
     </figure>
   </sect3>
+  
+  <sect3 id="crop-layer-to-content">
+    <title>Crop to content</title>
+    <para>
+      The <guimenuitem>Crop to content</guimenuitem> command automatically
+      crops the active layer, unlike the
+      <link linkend="gimp-tool-crop">Crop Tool</link>, or the
+      <link linkend="crop-layer-to-selection">Crop to Selection</link> command 
+      which let you manually define the area to be cropped.
+    </para>
+    <para>
+      This command removes the largest possible area around the outside edge
+      which all has the same color. It does this by scanning the layer along a
+      horizontal line and a vertical line and cropping the layer as soon as it
+      encounters a different color, whatever its transparency.
+    </para>
+    <para>
+      You can use this command to crop the layer to the dimensions of a subject
+      that is lost in a solid background which is too large.
+    </para>
+    <figure>
+      <title><quote>Crop to content</quote> example</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata format="PNG"
+            fileref="images/menus/layer/autocrop-1.png"/>
+        </imageobject>
+        <caption>
+          <para>
+            Before applying <quote>Crop to content</quote>
+          </para>
+        </caption>
+      </mediaobject>
+      <mediaobject>
+        <imageobject>
+          <imagedata format="PNG"
+            fileref="images/menus/layer/autocrop-2.png"/>
+        </imageobject>
+        <caption>
+          <para>
+            After applying <quote>Crop to content</quote>: the active layer,
+            up, has been cropped to the size of the circle it contains. Its
+            size is reduced, and the unoccupied part in the canvas is
+            transparent, revealing the yellow and green colors of the
+            underlying layer.
+          </para>
+        </caption>
+      </mediaobject>
+    </figure>
+  </sect3>
+  
+  <sect3>
+    <title>Activating the Command</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          You can access this command from the image menubar through
+          <menuchoice>
+            <guimenu>Layer</guimenu>
+            <guimenuitem>Crop to Selection</guimenuitem>
+          </menuchoice>.
+        </para>
+      </listitem>
+    </itemizedlist>
+  </sect3>
+
 </sect2>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]