From 7053c175f81010c05b19815edef0321715735ea6 Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Mon, 3 Jul 2017 13:44:37 +0200
Subject: [PATCH] Removed "remove paragraph tags" field

---
 .../insertfield/insertfield.controller.js        |  2 --
 .../common/overlays/insertfield/insertfield.html | 16 ----------------
 src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml    |  2 --
 src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml    |  2 --
 src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml |  2 --
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml    |  2 --
 src/Umbraco.Web.UI/umbraco/config/lang/de.xml    |  2 --
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml    |  3 ---
 src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml |  3 ---
 src/Umbraco.Web.UI/umbraco/config/lang/es.xml    |  2 --
 src/Umbraco.Web.UI/umbraco/config/lang/fr.xml    |  3 ---
 src/Umbraco.Web.UI/umbraco/config/lang/he.xml    |  2 --
 src/Umbraco.Web.UI/umbraco/config/lang/it.xml    |  2 --
 src/Umbraco.Web.UI/umbraco/config/lang/ja.xml    |  2 --
 src/Umbraco.Web.UI/umbraco/config/lang/ko.xml    |  2 --
 src/Umbraco.Web.UI/umbraco/config/lang/nl.xml    |  2 --
 src/Umbraco.Web.UI/umbraco/config/lang/pl.xml    |  2 --
 src/Umbraco.Web.UI/umbraco/config/lang/pt.xml    |  2 --
 src/Umbraco.Web.UI/umbraco/config/lang/ru.xml    |  2 --
 src/Umbraco.Web.UI/umbraco/config/lang/sv.xml    |  2 --
 src/Umbraco.Web.UI/umbraco/config/lang/zh.xml    |  3 ---
 21 files changed, 60 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js
index 96f67649d6..7cdd25285a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js
@@ -21,7 +21,6 @@
         vm.encodeHtml = false;
         vm.encodeUrl = false;
         vm.convertLinebreaks = false;
-        vm.removeParagraphTags = false;
 
         vm.showAltField = false;
         vm.showAltText = false;
@@ -130,7 +129,6 @@
                 + (vm.encodeHtml !== false ? ', encoding: ' + "RenderFieldEncodingType.Html" : "")
                 + (vm.encodeUrl !== false ? ', encoding: ' + "RenderFieldEncodingType.Url" : "")
                 + (vm.convertLinebreaks !== false ? ', convertLineBreaks: ' + "true" : "")
-                + (vm.removeParagraphTags !== false ? ', removeParagraphTags: ' + "true": "")
                 + (vm.field ? ')' : "");
 
             $scope.model.umbracoField = pageField;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
index 021b695716..ce522ec910 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
@@ -168,22 +168,6 @@
             </div>
         </div>
 
-        <!-- Remove paragraph tags -->
-        <div class="control-group umb-control-group">
-            <div class="umb-el-wrap">
-                <div class="controls">
-                    <div>
-                        <label class="control-label" for="paragraph">
-                            <localize key="templateEditor_removeParagraph">Remove paragraph tags</localize>
-                            <small><localize key="templateEditor_removeParagraphHelp">Will remove any paragraph tag in the beginning and end of the text</localize></small>
-                        </label>
-                    </div>
-                    <input type="checkbox" name="paragraph" ng-model="vm.removeParagraphTags">
-                    <localize key="templateEditor_removeParagraphDescription">Yes, remove paragraph tags</localize>
-                </div>
-            </div>
-        </div>
-
         <!-- Output -->
         <div class="control-group umb-control-group -no-border">
             <div class="umb-el-wrap">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
index 3ee2c563f7..5ca5078e72 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
@@ -911,8 +911,6 @@
     <key alias="postContent">Vložit za polem</key>
     <key alias="preContent">Vložit před polem</key>
     <key alias="recursive">Rekurzivní</key>
-    <key alias="removeParagraph">Odstranit tagy odstavce</key>
-    <key alias="removeParagraphHelp">Odstraní jakékoliv &amp;lt;P&amp;gt; na začátku a na konci textu</key>
     <key alias="standardFields">Standardní pole</key>
     <key alias="uppercase">Velká písmena</key>
     <key alias="urlEncode">Kódování URL</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
index e20bbf57e5..c6c6093395 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
@@ -884,8 +884,6 @@ Vennlig hilsen Umbraco roboten
     <key alias="postContent">Sett inn etter felt</key>
     <key alias="preContent">Sett inn før felt</key>
     <key alias="recursive">Rekursivt</key>
-    <key alias="removeParagraph">Fjern paragraftagger</key>
-    <key alias="removeParagraphHelp">Fjerner eventuelle &lt;P&gt; rundt teksten</key>
     <key alias="standardFields">Standardfelter</key>
     <key alias="uppercase">Store bokstaver</key>
     <key alias="urlEncode">URL koding</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
index 7212b4d97d..53e893ea23 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
@@ -1100,8 +1100,6 @@
     <key alias="postContent">欄位後插入</key>
     <key alias="preContent">欄位前插入</key>
     <key alias="recursive">遞迴</key>
-    <key alias="removeParagraph">移除段落符號</key>
-    <key alias="removeParagraphHelp">將會在字串首尾移除任何 &amp;lt;P&amp;gt; 符號</key>
     <key alias="standardFields">標準欄位</key>
     <key alias="uppercase">大寫</key>
     <key alias="urlEncode">URL編碼</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index bed45d7cb7..bc3fccfd34 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -1145,8 +1145,6 @@ Mange hilsner fra Umbraco robotten
     <key alias="postContent">Indsæt efter felt</key>
     <key alias="preContent">Indsæt før felt</key>
     <key alias="recursive">Rekursivt</key>
-    <key alias="removeParagraph">Fjern paragraf-tags</key>
-    <key alias="removeParagraphHelp">Fjerner eventuelle &amp;lt;P&amp;gt; omkring teksten</key>
     <key alias="standardFields">Standard felter</key>
     <key alias="uppercase">Uppercase</key>
     <key alias="urlEncode">URL encode</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
index 70dc22b439..7dade3efa7 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
@@ -903,8 +903,6 @@ Wenn Sie sich für Runway entscheiden, können Sie optional Blöcke nutzen, die
     <key alias="postContent">An den Feldinhalt anhängen</key>
     <key alias="preContent">Dem Feldinhalt voranstellen</key>
     <key alias="recursive">Rekursiv</key>
-    <key alias="removeParagraph">Textabsatz entfernen</key>
-    <key alias="removeParagraphHelp">Alle &lt;p&gt; am Anfang und am Ende des Feldinhalts werden entfernt</key>
     <key alias="standardFields">Standardfelder</key>
     <key alias="uppercase">Großbuchstaben</key>
     <key alias="urlEncode">URL kodieren</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 7ae50ed809..fc5861165d 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -1345,9 +1345,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="preContent">Insert before field</key>
     <key alias="recursive">Recursive</key>
     <key alias="recursiveDescr">Yes, make it recursive</key>
-    <key alias="removeParagraph">Remove paragraph tags</key>
-    <key alias="removeParagraphDescription">Yes, remove paragraph tags</key>
-    <key alias="removeParagraphHelp">Will remove any paragraph tag in the beginning and end of the text</key>
     <key alias="separator">Separator</key>
     <key alias="standardFields">Standard Fields</key>
     <key alias="uppercase">Uppercase</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index d8d0cff830..c099c4e1a8 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -1343,9 +1343,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="preContent">Insert before field</key>
     <key alias="recursive">Recursive</key>
     <key alias="recursiveDescr">Yes, make it recursive</key>
-    <key alias="removeParagraph">Remove paragraph tags</key>
-    <key alias="removeParagraphDescription">Yes, remove paragraph tags</key>
-    <key alias="removeParagraphHelp">Will remove any paragraph tag in the beginning and end of the text</key>
     <key alias="separator">Separator</key>
     <key alias="standardFields">Standard Fields</key>
     <key alias="uppercase">Uppercase</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
index 3635ec6f23..ad0c3ecf30 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
@@ -809,8 +809,6 @@
     <key alias="postContent">Insertar después del campo</key>
     <key alias="preContent">Insertar antes del campo</key>
     <key alias="recursive">Recursivo</key>
-    <key alias="removeParagraph">Borrar los tags del párrafo</key>
-    <key alias="removeParagraphHelp">Borrará cualquier &amp;lt;P&amp;gt; al principio y al final del texto</key>
     <key alias="uppercase">Mayúscula</key>
     <key alias="urlEncode">Codificar URL</key>
     <key alias="urlEncodeHelp">Formateará los caracteres especiales de las URLs</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
index 093c1a0af5..753f8513e4 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
@@ -1345,9 +1345,6 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="preContent">Insérer avant le champ</key>
     <key alias="recursive">Récursif</key>
     <key alias="recursiveDescr">Oui, rendre récursif</key>
-    <key alias="removeParagraph">Supprimer les balises de paragraphe</key>
-    <key alias="removeParagraphDescription">Oui, supprimer les balises de paragraphe</key>
-    <key alias="removeParagraphHelp">Supprimera toute balise &amp;lt;P&amp;gt; au début et à la fin du texte</key>
     <key alias="separator">Séparateur</key>
     <key alias="standardFields">Champs standards</key>
     <key alias="uppercase">Majuscules</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
index 02d8311c14..a99066ed24 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
@@ -818,8 +818,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="postContent">הוסף אחרי השדה</key>
     <key alias="preContent">הוסף לפני השדה</key>
     <key alias="recursive">רקורסיבי</key>
-    <key alias="removeParagraph">הסר תגי פסקה</key>
-    <key alias="removeParagraphHelp">מסיר את כל ה- &amp;lt;P&amp;gt; בתחילת ובסוף הטקסט</key>
     <key alias="uppercase">אותיות גדולות</key>
     <key alias="urlEncode">קידוד URL</key>
     <key alias="urlEncodeHelp">תווים מיוחדים יעוצבו ב- URL</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
index 171dcd4902..a9bc64d9f9 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
@@ -789,8 +789,6 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
     <key alias="postContent"><![CDATA[Inserisci dopo il campo]]></key>
     <key alias="preContent"><![CDATA[Inserisci prima il campo]]></key>
     <key alias="recursive">Ricorsivo</key>
-    <key alias="removeParagraph"><![CDATA[Rimuovi i tag paragrafo]]></key>
-    <key alias="removeParagraphHelp"><![CDATA[Rimuoverà &lt;P&gt; all'inizio e alla fine del testo]]></key>
     <key alias="standardFields">Campi Standard</key>
     <key alias="uppercase">Maiuscolo</key>
     <key alias="urlEncode"><![CDATA[Codifica URL]]></key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
index d01caaa315..21417dfbcb 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
@@ -1108,8 +1108,6 @@ Runwayをインストールして作られた新しいウェブサイトがど
     <key alias="postContent">フィールド値の後ろ追加</key>
     <key alias="preContent">フィールド値の前に追加</key>
     <key alias="recursive">再帰的</key>
-    <key alias="removeParagraph">段落タグの消去</key>
-    <key alias="removeParagraphHelp">段落タグ &amp;lt;P&amp;gt; を消去します</key>
     <key alias="standardFields">標準フィールド</key>
     <key alias="uppercase">大文字変換</key>
     <key alias="urlEncode">URLエンコード</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
index b72503e987..ee9be97c71 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
@@ -794,8 +794,6 @@
     <key alias="postContent">필드뒤에 삽입</key>
     <key alias="preContent">필드앞에 삽입</key>
     <key alias="recursive">Recursive</key>
-    <key alias="removeParagraph">단락 태그삭제</key>
-    <key alias="removeParagraphHelp">문서 시작과 끝의 &amp;amp;lt;P&amp;amp;gt; 를 삭제하시겠습니까</key>
     <key alias="uppercase">대문자</key>
     <key alias="urlEncode">URL 인코딩</key>
     <key alias="urlEncodeHelp">URL의 특수문자를 포맷하겠습니까</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
index 0126a05962..0d7faa9f14 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
@@ -1173,8 +1173,6 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="postContent">Invoegen na veld</key>
     <key alias="preContent">Invoegen voor veld</key>
     <key alias="recursive">Recursief</key>
-    <key alias="removeParagraph">Verwijder paragraaf tags</key>
-    <key alias="removeParagraphHelp"><![CDATA[Alle <P> tags aan het begin en einde van de tekst worden verwijderd]]></key>
     <key alias="standardFields">Standaard velden</key>
     <key alias="uppercase">Hoofdletters</key>
     <key alias="urlEncode">URL-encoderen</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
index 5ae15f11da..30e4f3039c 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
@@ -1280,8 +1280,6 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     <key alias="postContent">Wstaw za polem</key>
     <key alias="preContent">Wstaw przed polem</key>
     <key alias="recursive">Rekurencyjne</key>
-    <key alias="removeParagraph">Usuń znaki paragrafu</key>
-    <key alias="removeParagraphHelp">Usuwa wszystkie &amp;lt;P&amp;gt; z początku i końca tekstu</key>
     <key alias="standardFields">Standardowe Pola</key>
     <key alias="uppercase">Wielkie litery</key>
     <key alias="urlEncode">Kodowanie URL</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
index adc26ca46a..1953dac8f8 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
@@ -783,8 +783,6 @@ Você pode publicar esta página e todas suas sub-páginas ao selecionar <em>pub
     <key alias="postContent">Inserir após campo</key>
     <key alias="preContent">Inserir antes do campo</key>
     <key alias="recursive">Recursivo</key>
-    <key alias="removeParagraph">Remover etiquetas de parágrafo</key>
-    <key alias="removeParagraphHelp">Removerá quaisquer &amp;lt;P&amp;gt; do começo ao fim do texto</key>
     <key alias="uppercase">Maiúscula</key>
     <key alias="urlEncode">Codificar URL</key>
     <key alias="urlEncodeHelp">Vai formatar caracteres especiais em URLs</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
index 1a0d55b6c4..72f8b37a28 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
@@ -1447,8 +1447,6 @@
     <key alias="preContent">Вставить перед полем</key>
     <key alias="recursive">Рекурсивно</key>
     <key alias="recursiveDescr">Да, использовать рекурсию</key>
-    <key alias="removeParagraph">Удалить тэги параграфов</key>
-    <key alias="removeParagraphHelp">Удаляются тэги параграфа ('p') в начале и в конце абзацев</key>
     <key alias="separator">Разделитель</key>
     <key alias="standardFields">Стандартные</key>
     <key alias="uppercase">В верхнем регистре</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
index 75bb41e35c..51c780f57e 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
@@ -820,8 +820,6 @@
     <key alias="postContent">Infoga efter fält</key>
     <key alias="preContent">Infoga före fält</key>
     <key alias="recursive">Rekursiv</key>
-    <key alias="removeParagraph">Avlägsna stycke-taggar</key>
-    <key alias="removeParagraphHelp">Kommer att avlägsna alla &amp;lt;P&amp;gt; i början och slutet av texten</key>
     <key alias="standardFields">Standardfält</key>
     <key alias="uppercase">Versaler</key>
     <key alias="urlEncode">URL-koda</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
index dedc48e167..0be2f5ffa9 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
@@ -1345,9 +1345,6 @@
     <key alias="preContent">字段前插入</key>
     <key alias="recursive">递归</key>
     <key alias="recursiveDescr">是, 让它递归</key>
-    <key alias="removeParagraph">移除段落符号</key>
-    <key alias="removeParagraphDescription">是, 删除段落标记</key>
-    <key alias="removeParagraphHelp">将删除文本开头和结尾的任何段落标记</key>
     <key alias="separator">分隔符</key>
     <key alias="standardFields">标准字段</key>
     <key alias="uppercase">大写</key>