From 63637a927ab662db25b50db0146c99b791458b7b Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Mon, 30 Oct 2017 21:35:48 -0700
Subject: [PATCH] Remove unnecessary restriction on variable names.

---
 core/variables.js       | 12 ------------
 msg/json/be-tarask.json |  1 -
 msg/json/bg.json        |  1 -
 msg/json/br.json        |  1 -
 msg/json/da.json        |  1 -
 msg/json/de.json        |  1 -
 msg/json/en.json        |  1 -
 msg/json/es.json        |  1 -
 msg/json/fi.json        |  1 -
 msg/json/fr.json        |  1 -
 msg/json/hi.json        |  1 -
 msg/json/it.json        |  1 -
 msg/json/kab.json       |  1 -
 msg/json/ko.json        |  1 -
 msg/json/lb.json        |  1 -
 msg/json/nb.json        |  1 -
 msg/json/nl.json        |  1 -
 msg/json/pl.json        |  1 -
 msg/json/pms.json       |  1 -
 msg/json/pt-br.json     |  1 -
 msg/json/qqq.json       |  1 -
 msg/json/ru.json        |  1 -
 msg/json/sv.json        |  1 -
 msg/json/tcy.json       |  1 -
 msg/json/tr.json        |  1 -
 msg/json/uk.json        |  1 -
 msg/json/vi.json        |  1 -
 msg/json/zh-hans.json   |  1 -
 msg/json/zh-hant.json   |  1 -
 msg/messages.js         |  4 +---
 30 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/core/variables.js b/core/variables.js
index 5bc8c5f3c..16760ed3f 100644
--- a/core/variables.js
+++ b/core/variables.js
@@ -247,12 +247,6 @@ Blockly.Variables.createVariable = function(workspace, opt_callback, opt_type) {
                 function() {
                   promptAndCheckWithAlert(text);  // Recurse
                 });
-          } else if (Blockly.Procedures.isNameUsed(text, workspace)) {
-            Blockly.alert(Blockly.Msg.PROCEDURE_ALREADY_EXISTS.replace('%1',
-                text.toLowerCase()),
-                function() {
-                  promptAndCheckWithAlert(text);  // Recurse
-                });
           } else {
             workspace.createVariable(text, opt_type);
             if (opt_callback) {
@@ -294,12 +288,6 @@ Blockly.Variables.renameVariable = function(workspace, variable,
                 function() {
                   promptAndCheckWithAlert(newName);  // Recurse
                 });
-          } else if (Blockly.Procedures.isNameUsed(newName, workspace)) {
-            Blockly.alert(Blockly.Msg.PROCEDURE_ALREADY_EXISTS.replace('%1',
-                newName.toLowerCase()),
-                function() {
-                  promptAndCheckWithAlert(newName);  // Recurse
-                });
           } else {
             workspace.renameVariable(variable.name, newName);
             if (opt_callback) {
diff --git a/msg/json/be-tarask.json b/msg/json/be-tarask.json
index 872011bd5..02a70a524 100644
--- a/msg/json/be-tarask.json
+++ b/msg/json/be-tarask.json
@@ -33,7 +33,6 @@
 	"NEW_VARIABLE_TITLE": "Імя новай зьменнай:",
 	"VARIABLE_ALREADY_EXISTS": "Зьменная з назвай «%1» ужо існуе.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "Зьменная з назвай «%1» ужо існуе зь іншым тыпам «%2».",
-	"PROCEDURE_ALREADY_EXISTS": "Працэдура з назвай «%1» ужо існуе.",
 	"DELETE_VARIABLE_CONFIRMATION": "Выдаліць %1 выкарыстаньняў зьменнай «%2»?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "Немагчыма выдаліць зьменную «%1», таму што яна зьяўляецца часткай вызначэньня функцыі «%2»",
 	"DELETE_VARIABLE": "Выдаліць зьменную «%1»",
diff --git a/msg/json/bg.json b/msg/json/bg.json
index 11994dbac..dd2b6ae38 100644
--- a/msg/json/bg.json
+++ b/msg/json/bg.json
@@ -34,7 +34,6 @@
 	"NEW_VARIABLE": "Създаване на променлива...",
 	"NEW_VARIABLE_TITLE": "Ново име на променливата:",
 	"VARIABLE_ALREADY_EXISTS": "Променлива с име '%1' вече съществува.",
-	"PROCEDURE_ALREADY_EXISTS": "Процедура с име '%1' вече съществува.",
 	"DELETE_VARIABLE_CONFIRMATION": "Изтриване на %1 използване на променлива '%2'?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "Променливата '%1' не може да бъде изтрита, защото е част от определението на функцията '%2'",
 	"DELETE_VARIABLE": "Изтриване на променливата \"%1\"",
diff --git a/msg/json/br.json b/msg/json/br.json
index 5b9c53b68..e5f790886 100644
--- a/msg/json/br.json
+++ b/msg/json/br.json
@@ -34,7 +34,6 @@
 	"NEW_VARIABLE_TITLE": "Anv an argemmenn nevez :",
 	"VARIABLE_ALREADY_EXISTS": "Un argemm anvet '%1' zo anezhañ dija.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "Un argemenn anvet '%1' zo c'hoazh evit un argemenn all eus ar seurt '%2'.",
-	"PROCEDURE_ALREADY_EXISTS": "Un argerzhadur anvet '%1' zo anezhañ dija.",
 	"DELETE_VARIABLE_CONFIRMATION": "Lemel %1 implij eus an argemm '%2' ?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "Ne ch'aller ket dilemel an argemm \"%1\" dre m'eo lod eus dielfennadur an arc'hwel \"%2\"",
 	"DELETE_VARIABLE": "Lemel an argemm '%1'",
diff --git a/msg/json/da.json b/msg/json/da.json
index aa1a87ced..b206d01e5 100644
--- a/msg/json/da.json
+++ b/msg/json/da.json
@@ -36,7 +36,6 @@
 	"NEW_VARIABLE_TITLE": "Navn til den nye variabel:",
 	"VARIABLE_ALREADY_EXISTS": "En variabel med navnet »%1« findes allerede.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "En variabel med navnet »%1« findes allerede for en anden variabel af typen »%2«.",
-	"PROCEDURE_ALREADY_EXISTS": "En procedure navngivet »%1« findes allerede.",
 	"DELETE_VARIABLE_CONFIRMATION": "Slet %1's brug af variablen »%2«?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "Kan ikke slette variablen »%1« da den er en del af definitionen af funktionen »%2«",
 	"DELETE_VARIABLE": "Slet variablen »%1«",
diff --git a/msg/json/de.json b/msg/json/de.json
index 4f18b2776..8045206ed 100644
--- a/msg/json/de.json
+++ b/msg/json/de.json
@@ -38,7 +38,6 @@
 	"NEW_VARIABLE_TITLE": "Name der neuen Variable:",
 	"VARIABLE_ALREADY_EXISTS": "Eine Variable namens „%1“ ist bereits vorhanden.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "Eine Variable namens „%1“ ist bereits für eine andere Variable des Typs „%2“ vorhanden.",
-	"PROCEDURE_ALREADY_EXISTS": "Eine Prozedur namens „%1“ ist bereits vorhanden.",
 	"DELETE_VARIABLE_CONFIRMATION": "%1 Verwendungen der Variable „%2“ löschen?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "Die Variable „%1“ kann nicht gelöscht werden, da sie Teil der Definition der Funktion „%2“ ist.",
 	"DELETE_VARIABLE": "Die Variable „%1“ löschen",
diff --git a/msg/json/en.json b/msg/json/en.json
index 91ff15b85..af9147868 100644
--- a/msg/json/en.json
+++ b/msg/json/en.json
@@ -32,7 +32,6 @@
 	"NEW_VARIABLE_TITLE": "New variable name:",
 	"VARIABLE_ALREADY_EXISTS": "A variable named '%1' already exists.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "A variable named '%1' already exists for another variable of type '%2'.",
-	"PROCEDURE_ALREADY_EXISTS": "A procedure named '%1' already exists.",
 	"DELETE_VARIABLE_CONFIRMATION": "Delete %1 uses of the '%2' variable?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "Can't delete the variable '%1' because it's part of the definition of the function '%2'",
 	"DELETE_VARIABLE": "Delete the '%1' variable",
diff --git a/msg/json/es.json b/msg/json/es.json
index 303ce50cc..63349f832 100644
--- a/msg/json/es.json
+++ b/msg/json/es.json
@@ -40,7 +40,6 @@
 	"NEW_VARIABLE_TITLE": "Nombre de variable nueva:",
 	"VARIABLE_ALREADY_EXISTS": "Ya existe una variable llamada \"%1\".",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "Ya existe una variable nombrada \"%1\" para otra variable del tipo \"%2\".",
-	"PROCEDURE_ALREADY_EXISTS": "Ya existe un procedimiento llamado \"%1\".",
 	"DELETE_VARIABLE_CONFIRMATION": "¿Borrar %1 usos de la variable \"%2\"?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "No se puede eliminar la variable \"%1\" porque es parte de la definición de la función \"%2\"",
 	"DELETE_VARIABLE": "Borrar la variable \"%1\"",
diff --git a/msg/json/fi.json b/msg/json/fi.json
index 8adb96f1e..9895d096a 100644
--- a/msg/json/fi.json
+++ b/msg/json/fi.json
@@ -42,7 +42,6 @@
 	"NEW_VARIABLE_TITLE": "Uuden muuttujan nimi:",
 	"VARIABLE_ALREADY_EXISTS": "Muuttuja nimeltään '%1' jo olemassa.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "Muuttuja nimeltä '%1' on jo olemassa toiselle muuttujalle tyypiltään '%2'.",
-	"PROCEDURE_ALREADY_EXISTS": "Toiminto nimeltään '%1' on jo olemassa.",
 	"DELETE_VARIABLE_CONFIRMATION": "Poistetaanko %1 käyttöä muuttujalta '%2'?",
 	"DELETE_VARIABLE": "Poista muuttuja '%1'",
 	"COLOUR_PICKER_HELPURL": "https://fi.wikipedia.org/wiki/V%C3%A4ri",
diff --git a/msg/json/fr.json b/msg/json/fr.json
index 9746df4f4..7ab507b2e 100644
--- a/msg/json/fr.json
+++ b/msg/json/fr.json
@@ -39,7 +39,6 @@
 	"NEW_VARIABLE_TITLE": "Nouveau nom de la variable :",
 	"VARIABLE_ALREADY_EXISTS": "Une variable appelée '%1' existe déjà.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "Une variable nommée '%1' existe déjà pour une autre variable de type '%2'.",
-	"PROCEDURE_ALREADY_EXISTS": "Une procédure appelée '%1' existe déjà.",
 	"DELETE_VARIABLE_CONFIRMATION": "Supprimer %1 utilisations de la variable '%2' ?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "Impossible de supprimer la variable '%1' parce qu’elle fait partie de la définition de la fonction '%2'",
 	"DELETE_VARIABLE": "Supprimer la variable '%1'",
diff --git a/msg/json/hi.json b/msg/json/hi.json
index 79354d8cc..6643860f3 100644
--- a/msg/json/hi.json
+++ b/msg/json/hi.json
@@ -36,7 +36,6 @@
 	"NEW_VARIABLE_TITLE": "नए चर का नाम:",
 	"VARIABLE_ALREADY_EXISTS": "प्राचल नाम '%1' पहले से मौजूद है।",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "'%1' नाम का एक चर पहले से '%2' प्रकार के अन्य चर के लिए मौजूद है।",
-	"PROCEDURE_ALREADY_EXISTS": "'%1' नाम की एक प्रक्रिया पहले से मौजूद है।",
 	"DELETE_VARIABLE_CONFIRMATION": "'%2' चर के %1 उपयोग को हटाएँ?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "चर '%1' को नहीं हटा सकता क्योंकि यह फ़ंक्शन '%2' की परिभाषा का हिस्सा है",
 	"DELETE_VARIABLE": "'%1' चर को हटाएँ",
diff --git a/msg/json/it.json b/msg/json/it.json
index 90bf54f51..cc1f876a1 100644
--- a/msg/json/it.json
+++ b/msg/json/it.json
@@ -40,7 +40,6 @@
 	"NEW_VARIABLE_TITLE": "Nome della nuova variabile:",
 	"VARIABLE_ALREADY_EXISTS": "Una variabile denominata '%1' esiste già.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "Una variabile nominata \"%1\" esiste già per un'altra variabile del tipo \"%2\".",
-	"PROCEDURE_ALREADY_EXISTS": "Una procedura denominata '%1' esiste già.",
 	"DELETE_VARIABLE_CONFIRMATION": "Cancella %1 usi della variabile '%2'?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "Non si può cancellare la variabile '%1' perché è parte della definizione della funzione '%2'",
 	"DELETE_VARIABLE": "Cancella la variabile '%1'",
diff --git a/msg/json/kab.json b/msg/json/kab.json
index caa2c82e7..050e301c1 100644
--- a/msg/json/kab.json
+++ b/msg/json/kab.json
@@ -33,7 +33,6 @@
 	"NEW_VARIABLE_TITLE": "Isem amaynut n wazal",
 	"VARIABLE_ALREADY_EXISTS": "Amutti s yisem '%1' yella yakan.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "Amutti s yisem '%1' yella yakan i umutti-nniḍen s wanaw '%2'.",
-	"PROCEDURE_ALREADY_EXISTS": "Tasekkirt s yisem '%1' tella yakan.",
 	"DELETE_VARIABLE_CONFIRMATION": "Kkes %1 n useqdec n umutti '%2'?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "Ur izmir ara ad yekkes amutti '%1' acku yedda di tbadut n twuri '%2'",
 	"DELETE_VARIABLE": "Kkes amutti '%1'",
diff --git a/msg/json/ko.json b/msg/json/ko.json
index b671c4b6d..f94b7650d 100644
--- a/msg/json/ko.json
+++ b/msg/json/ko.json
@@ -41,7 +41,6 @@
 	"NEW_VARIABLE_TITLE": "새 변수 이름:",
 	"VARIABLE_ALREADY_EXISTS": "'%1' 변수는 이미 존재합니다.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "'%1' 변수는 '%2' 유형의 다른 변수에 대해 이미 존재합니다.",
-	"PROCEDURE_ALREADY_EXISTS": "'%1' 함수는 이미 존재합니다.",
 	"DELETE_VARIABLE_CONFIRMATION": "'%2' 변수에서 %1을(를) 삭제하시겠습니까?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "'%2' 함수 정의의 일부이기 때문에 '%1' 변수를 삭제할 수 없습니다",
 	"DELETE_VARIABLE": "'%1' 변수를 삭제합니다",
diff --git a/msg/json/lb.json b/msg/json/lb.json
index 029ac9572..4bf716eb1 100644
--- a/msg/json/lb.json
+++ b/msg/json/lb.json
@@ -28,7 +28,6 @@
 	"RENAME_VARIABLE_TITLE": "All '%1' Variabelen ëmbenennen op:",
 	"NEW_VARIABLE": "Variabel uleeën...",
 	"NEW_VARIABLE_TITLE": "Neie variabelen Numm:",
-	"PROCEDURE_ALREADY_EXISTS": "Et gëtt schonn eng Prozedur mam Numm '%1'.",
 	"COLOUR_PICKER_TOOLTIP": "Sicht eng Faarf an der Palette eraus.",
 	"COLOUR_RANDOM_TITLE": "zoufälleg Faarf",
 	"COLOUR_RANDOM_TOOLTIP": "Eng zoufälleg Faarf eraussichen.",
diff --git a/msg/json/nb.json b/msg/json/nb.json
index 55362e7ea..017c296d9 100644
--- a/msg/json/nb.json
+++ b/msg/json/nb.json
@@ -35,7 +35,6 @@
 	"NEW_VARIABLE_TITLE": "Nytt variabelnavn:",
 	"VARIABLE_ALREADY_EXISTS": "En variabel med navn «%1» finnes allerede.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "En variabel med navn «%1» finnes allerede for en annen variabel av typen «%2».",
-	"PROCEDURE_ALREADY_EXISTS": "En prosedyre med navn «%1» finnes allerede.",
 	"DELETE_VARIABLE_CONFIRMATION": "Slett %1 bruk av variabelen «%2»?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "Kan ikke slette variabelen «%1» fordi den er del av definisjonen for funksjonen «%2»",
 	"DELETE_VARIABLE": "Slett variabelen «%1»",
diff --git a/msg/json/nl.json b/msg/json/nl.json
index 85021e177..d14a72909 100644
--- a/msg/json/nl.json
+++ b/msg/json/nl.json
@@ -39,7 +39,6 @@
 	"NEW_VARIABLE": "Variabele maken...",
 	"NEW_VARIABLE_TITLE": "Nieuwe variabelenaam:",
 	"VARIABLE_ALREADY_EXISTS": "Er bestaat al een variabele met de naam \"%1\".",
-	"PROCEDURE_ALREADY_EXISTS": "Er bestaat al een variabele met de naam \"%1\".",
 	"DELETE_VARIABLE_CONFIRMATION": "%1 gebruiken van de variabele \"%2\" verwijderen?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "De variabele \"%1\" kan niet verwijderd worden omdat die onderdeel uitmaakt van de definitie van de functie \"%2\"",
 	"DELETE_VARIABLE": "Verwijder de variabele \"%1\"",
diff --git a/msg/json/pl.json b/msg/json/pl.json
index c0b901931..1b45ae580 100644
--- a/msg/json/pl.json
+++ b/msg/json/pl.json
@@ -48,7 +48,6 @@
 	"NEW_VARIABLE_TITLE": "Nowa nazwa zmiennej:",
 	"VARIABLE_ALREADY_EXISTS": "Zmienna o nazwie '%1' już istnieje.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "Zmienna o nazwie '%1' już istnieje i jest typu '%2'.",
-	"PROCEDURE_ALREADY_EXISTS": "Procedura o nazwie '%1' już istnieje.",
 	"DELETE_VARIABLE_CONFIRMATION": "Usunąć %1 wystąpień zmiennej '%2'?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "Nie można usunąć zmiennej '%1', ponieważ jest częścią definicji funkcji '%2'",
 	"DELETE_VARIABLE": "Usuń zmienną '%1'",
diff --git a/msg/json/pms.json b/msg/json/pms.json
index 6654d478c..984751a2b 100644
--- a/msg/json/pms.json
+++ b/msg/json/pms.json
@@ -31,7 +31,6 @@
 	"NEW_VARIABLE_TITLE": "Nòm ëd la neuva variàbil:",
 	"VARIABLE_ALREADY_EXISTS": "Na variàbil con ël nòm '%1' a esist già.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "Na variàbil ciamà '%1' a esist già për n'àutra variàbil ëd sòrt '%2'.",
-	"PROCEDURE_ALREADY_EXISTS": "Na procedura ciamà '%1' a esist già.",
 	"DELETE_VARIABLE_CONFIRMATION": "Eliminé %1 utilisassion ëd la variàbil '%2'?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "As peul nen eliminesse la variàbil '%1' përchè a l'é part ëd la definission dla fonsion '%2'",
 	"DELETE_VARIABLE": "Eliminé la variàbil '%1'",
diff --git a/msg/json/pt-br.json b/msg/json/pt-br.json
index 7e033cfc6..67ef5b04e 100644
--- a/msg/json/pt-br.json
+++ b/msg/json/pt-br.json
@@ -51,7 +51,6 @@
 	"NEW_VARIABLE_TITLE": "Nome da nova variável:",
 	"VARIABLE_ALREADY_EXISTS": "A variável chamada '%1' já existe.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "Uma variável chamada '%1' já existe para outra variável do tipo '%2'.",
-	"PROCEDURE_ALREADY_EXISTS": "Um procedimento chamado '%1' já existe.",
 	"DELETE_VARIABLE_CONFIRMATION": "Deletar %1 usos da variável '%2'?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "Não se pode deletar a variável '%1' porque é parte da definição da função '%2'",
 	"DELETE_VARIABLE": "Deletar a variável '%1'",
diff --git a/msg/json/qqq.json b/msg/json/qqq.json
index e701c323f..7c6abd540 100644
--- a/msg/json/qqq.json
+++ b/msg/json/qqq.json
@@ -26,7 +26,6 @@
 	"NEW_VARIABLE_TITLE": "prompt - Prompts the user to enter the name for a new variable.  See [https://github.com/google/blockly/wiki/Variables#dropdown-menu https://github.com/google/blockly/wiki/Variables#dropdown-menu].",
 	"VARIABLE_ALREADY_EXISTS": "alert - Tells the user that the name they entered is already in use.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "alert - Tells the user that the name they entered is already in use for another type.",
-	"PROCEDURE_ALREADY_EXISTS": "alert - Tells the user that the name they entered is already in use for a procedure.",
 	"DELETE_VARIABLE_CONFIRMATION": "confirm -  Ask the user to confirm their deletion of multiple uses of a variable.",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "alert - Tell the user that they can't delete a variable because it's part of the definition of a function.",
 	"DELETE_VARIABLE": "dropdown choice - Delete the currently selected variable.",
diff --git a/msg/json/ru.json b/msg/json/ru.json
index d9bafb36b..e935a5e66 100644
--- a/msg/json/ru.json
+++ b/msg/json/ru.json
@@ -39,7 +39,6 @@
 	"NEW_VARIABLE_TITLE": "Имя новой переменной:",
 	"VARIABLE_ALREADY_EXISTS": "Переменная с именем '%1' уже существует.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "Название переменной '%1' уже используется другой переменной типа '%2'.",
-	"PROCEDURE_ALREADY_EXISTS": "Процедура с именем '%1' уже существует.",
 	"DELETE_VARIABLE_CONFIRMATION": "Удалить %1 использований переменной '%2'?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "Невозможно удалить переменную '%1', поскольку она является частью определения функции '%2'",
 	"DELETE_VARIABLE": "Удалить переменную '%1'",
diff --git a/msg/json/sv.json b/msg/json/sv.json
index d9ab3d690..2710198b4 100644
--- a/msg/json/sv.json
+++ b/msg/json/sv.json
@@ -35,7 +35,6 @@
 	"NEW_VARIABLE_TITLE": "Nytt variabelnamn:",
 	"VARIABLE_ALREADY_EXISTS": "En variabel som heter \"%1\" finns redan.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "En variabel med namnet \"%1\" finns redan för en annan variabeln av typen \"%2\".",
-	"PROCEDURE_ALREADY_EXISTS": "En procedur som heter \"%1\" finns redan.",
 	"DELETE_VARIABLE_CONFIRMATION": "Radera %1 användningar av variabeln \"%2\"?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "Kan inte radera variabeln '%1' eftersom den är en del av definition för funktionen '%2'",
 	"DELETE_VARIABLE": "Radera variabeln \"%1\"",
diff --git a/msg/json/tcy.json b/msg/json/tcy.json
index 784bf68e9..d599eaacb 100644
--- a/msg/json/tcy.json
+++ b/msg/json/tcy.json
@@ -33,7 +33,6 @@
 	"NEW_VARIABLE": "ವ್ಯತ್ಯಯೊನು ಉಂಡು ಮಲ್ಪುಲೆ",
 	"NEW_VARIABLE_TITLE": "ಪೊಸ ವ್ಯತ್ಯಯೊದ ಪುದರ್:",
 	"VARIABLE_ALREADY_EXISTS": "'%1' ಪನ್ಪಿ ಪುದರ್‌ದ ವ್ಯತ್ಯಯೊ ದುಂಬೆ ಅಸ್ತಿತ್ವೊಡು ಉಂಡು.",
-	"PROCEDURE_ALREADY_EXISTS": "'%1' ಪನ್ಪಿ ಪುದರ್‌ದ ಕಾರ್ಯೊವಿದಾನೊ ದುಂಬೆ ಅಸ್ತಿತ್ವೊಡು ಉಂಡು.",
 	"DELETE_VARIABLE_CONFIRMATION": "'%2' ವ್ಯತ್ಯಯೊದ %1 ಉಪಯೋಗೊಲೆನ್ ಮಾಜಾವೊಡೆ?",
 	"DELETE_VARIABLE": "'%1' ವ್ಯತ್ಯಯೊನು ಮಾಜಾಲೆ",
 	"COLOUR_PICKER_HELPURL": "https://en.wikipedia.org/wiki/ಬಣ್ಣೊ",
diff --git a/msg/json/tr.json b/msg/json/tr.json
index aa0862bf9..0d6a76285 100644
--- a/msg/json/tr.json
+++ b/msg/json/tr.json
@@ -46,7 +46,6 @@
 	"NEW_VARIABLE_TITLE": "Yeni değişken ismi :",
 	"VARIABLE_ALREADY_EXISTS": "'%1' isimli değişken adı zaten var.",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "'%1' isimli değişken '%2' tipli başka bir değişkende tanımlı.",
-	"PROCEDURE_ALREADY_EXISTS": "'%1' isimli prosedür zaten var.",
 	"DELETE_VARIABLE_CONFIRMATION": "'%2' değişkeninin %1 kullanımını silmek istiyor musunuz?",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "'%1' değişkeni, '%2' fonksiyonunun tanımının bir parçası olduğu için silinemez",
 	"DELETE_VARIABLE": "'%1' değişkenini silmek istiyor musunuz?",
diff --git a/msg/json/uk.json b/msg/json/uk.json
index 70a656f06..5dbc8cefb 100644
--- a/msg/json/uk.json
+++ b/msg/json/uk.json
@@ -37,7 +37,6 @@
 	"NEW_VARIABLE": "Створити змінну...",
 	"NEW_VARIABLE_TITLE": "Нова назва змінної:",
 	"VARIABLE_ALREADY_EXISTS": "Змінна з назвою '%1' вже існує.",
-	"PROCEDURE_ALREADY_EXISTS": "Процес з назвою '%1' вже існує.",
 	"DELETE_VARIABLE_CONFIRMATION": "Вилучити %1 використання змінної '%2'?",
 	"DELETE_VARIABLE": "Вилучити змінну '%1'",
 	"COLOUR_PICKER_HELPURL": "https://uk.wikipedia.org/wiki/Колір",
diff --git a/msg/json/vi.json b/msg/json/vi.json
index 1f2ae9770..43cbbad00 100644
--- a/msg/json/vi.json
+++ b/msg/json/vi.json
@@ -34,7 +34,6 @@
 	"NEW_VARIABLE": "Tạo biến...",
 	"NEW_VARIABLE_TITLE": "Tên của biến mới:",
 	"VARIABLE_ALREADY_EXISTS": "Một biến có tên '%1' đã tồn tại.",
-	"PROCEDURE_ALREADY_EXISTS": "Một hàm có tên '%1' đã tồn tại.",
 	"COLOUR_PICKER_HELPURL": "https://vi.wikipedia.org/wiki/M%C3%A0u_s%E1%BA%AFc",
 	"COLOUR_PICKER_TOOLTIP": "Chọn một màu từ bảng màu.",
 	"COLOUR_RANDOM_TITLE": "màu bất kỳ",
diff --git a/msg/json/zh-hans.json b/msg/json/zh-hans.json
index c33c82eb5..110ac6591 100644
--- a/msg/json/zh-hans.json
+++ b/msg/json/zh-hans.json
@@ -41,7 +41,6 @@
 	"NEW_VARIABLE_TITLE": "新变量的名称：",
 	"VARIABLE_ALREADY_EXISTS": "已存在名为“%1”的变量。",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "名叫“%1”的变量已存在，但作为另一个变量类型“%2”存在。",
-	"PROCEDURE_ALREADY_EXISTS": "已存在名为“%1”的步骤。",
 	"DELETE_VARIABLE_CONFIRMATION": "删除“%2”变量的%1用途么？",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "不能删除变量“%1”，因为它是功能“%2”定义的一部分",
 	"DELETE_VARIABLE": "删除“%1”变量",
diff --git a/msg/json/zh-hant.json b/msg/json/zh-hant.json
index dba798c0a..8de205f71 100644
--- a/msg/json/zh-hant.json
+++ b/msg/json/zh-hant.json
@@ -39,7 +39,6 @@
 	"NEW_VARIABLE_TITLE": "新變數名稱：",
 	"VARIABLE_ALREADY_EXISTS": "一個名為「%1」的變數已存在。",
 	"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "用於其它「%2」類型的變數裡已存在名為「%1」的變數。",
-	"PROCEDURE_ALREADY_EXISTS": "一個名為「%1」的程序已存在。",
 	"DELETE_VARIABLE_CONFIRMATION": "刪除%1使用的「%2」變數？",
 	"CANNOT_DELETE_VARIABLE_PROCEDURE": "無法刪除變數「%1」，因為這是功能「%2」定義的一部份內容",
 	"DELETE_VARIABLE": "刪除變數「%1」",
diff --git a/msg/messages.js b/msg/messages.js
index 6621717e1..c4a2c2d54 100644
--- a/msg/messages.js
+++ b/msg/messages.js
@@ -43,7 +43,7 @@ goog.require('Blockly.Msg');
  */
 
 /**
- * Each message is preceded with a tripple-slash comment that becomes the
+ * Each message is preceded with a triple-slash comment that becomes the
  * message descriptor.  The build process extracts these descriptors, adds
  * them to msg/json/qqq.json, and they show up in the translation console.
  */
@@ -127,8 +127,6 @@ Blockly.Msg.NEW_VARIABLE_TITLE = 'New variable name:';
 Blockly.Msg.VARIABLE_ALREADY_EXISTS = 'A variable named "%1" already exists.';
 /// alert - Tells the user that the name they entered is already in use for another type.
 Blockly.Msg.VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE = 'A variable named "%1" already exists for another variable of type "%2".';
-/// alert - Tells the user that the name they entered is already in use for a procedure.
-Blockly.Msg.PROCEDURE_ALREADY_EXISTS = 'A procedure named "%1" already exists.';
 
 // Variable deletion.
 /// confirm -  Ask the user to confirm their deletion of multiple uses of a variable.