Introduction of PyICU for transliteration in python. Reversed changes in normalization.sql.

lib-php/admin/specialphrases.php

@@ -8,4 +8,4 @@ loadSettings(getcwd());
 
 (new \Nominatim\Shell(getSetting('NOMINATIM_TOOL')))
     ->addParams('import-special-phrases', '--from-wiki')
-    ->run();
+    ->run();

lib-php/migration/phraseSettingsToJson.php

@@ -1,16 +1,9 @@
 <?php
 
 $phpPhraseSettingsFile = $argv[1];
-<<<<<<< HEAD
 $jsonPhraseSettingsFile = dirname($phpPhraseSettingsFile).'/'.basename($phpPhraseSettingsFile, '.php').'.json';
 
 if (file_exists($phpPhraseSettingsFile) && !file_exists($jsonPhraseSettingsFile)) {
-=======
-$jsonPhraseSettingsFile = dirname($phpPhraseSettingsFile)."/".basename($phpPhraseSettingsFile, ".php").".json";
-
-if(file_exists($phpPhraseSettingsFile) && !file_exists($jsonPhraseSettingsFile))
-{
->>>>>>> 3d939458... Changed phrase_settings.py to phrase-settings.json and added migration function for old php settings file.
     include $phpPhraseSettingsFile;
 
     $data = array();
@@ -23,8 +16,4 @@ if(file_exists($phpPhraseSettingsFile) && !file_exists($jsonPhraseSettingsFile))
     $jsonFile = fopen($jsonPhraseSettingsFile, 'w');
     fwrite($jsonFile, json_encode($data));
     fclose($jsonFile);
-<<<<<<< HEAD
-}
-=======
-}
->>>>>>> 3d939458... Changed phrase_settings.py to phrase-settings.json and added migration function for old php settings file.
+}