diff --git a/addons/magazinerepack/stringtable.xml b/addons/magazinerepack/stringtable.xml
index 7030dc374e..135946f756 100644
--- a/addons/magazinerepack/stringtable.xml
+++ b/addons/magazinerepack/stringtable.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< master
+=======
+<!-- Edited with tabler - 2015-04-11 -->
+>>>>>>> HEAD~3
 <Project name="ACE">
     <Package name="MagazineRepack">
         <Key ID="STR_ACE_MagazineRepack_RepackMagazines">
@@ -8,7 +12,7 @@
             <French>Réorganiser les chargeurs</French>
             <Polish>Przepakuj magazynki</Polish>
             <Czech>Přepáskovat Zásobníky</Czech>
-            <Italian>Ricarica Caricatori</Italian>
+            <Italian>Ricarica caricatori</Italian>
             <Portuguese>Reorganizar Carregadores</Portuguese>
             <Hungarian>Újratárazás </Hungarian>
             <Russian>Перепаковать магазины</Russian>
@@ -20,7 +24,7 @@
             <French>Sélectionner menu des chargeurs</French>
             <Polish>Menu wyboru magazynków</Polish>
             <Czech>Zvolit Menu zásobníků</Czech>
-            <Italian>Seleziona Menù di Ricarica</Italian>
+            <Italian>Seleziona menù di ricarica</Italian>
             <Portuguese>Menu de Seleção de Carregador</Portuguese>
             <Hungarian>Fegyvertár menü kiválasztás</Hungarian>
             <Russian>Меню выбора магазинов</Russian>
@@ -32,7 +36,7 @@
             <French>Sélectionner chargeur</French>
             <Polish>Wybierz magazynek</Polish>
             <Czech>Zvolit zásobník</Czech>
-            <Italian>Seleziona Caricatore</Italian>
+            <Italian>Seleziona caricatore</Italian>
             <Portuguese>Selecionar Carregador</Portuguese>
             <Hungarian>Tár kiválasztása</Hungarian>
             <Russian>Выбрать магазин</Russian>
@@ -68,7 +72,7 @@
             <French>%1 chargeur(s) plein(s) et %2 cartouche(s) en rab</French>
             <Polish>Pełnych magazynków: %1.&lt;br/&gt;Dodatkowych naboi: %2.</Polish>
             <Czech>%1 plný zásobník(y) a %2 munice navíc</Czech>
-            <Italian>%1 caricatore/i pieno e %2 munizioni extra</Italian>
+            <Italian>%1 caricatore(i) pieno e %2 munizioni extra</Italian>
             <Portuguese>%1 carregador(es) cheio(s) e %2 disparo(s) a mais</Portuguese>
             <Hungarian>%1 teljes tár és %2 extra lőszer</Hungarian>
             <Russian>%1 полных магазина(ов) и %2 патрона(ов)</Russian>
diff --git a/addons/safemode/stringtable.xml b/addons/safemode/stringtable.xml
index f39ca84614..c997d026a2 100644
--- a/addons/safemode/stringtable.xml
+++ b/addons/safemode/stringtable.xml
@@ -47,6 +47,7 @@
             <Russian>Снят с предохранителя</Russian>
             <French>Sécurité enlevée</French>
             <Italian>Togli la sicura</Italian>
+            <Italian>Sicura tolta</Italian>
             <Portuguese>Tirou Segurança</Portuguese>
         </Key>
     </Package>
diff --git a/addons/vector/stringtable.xml b/addons/vector/stringtable.xml
index 47832c33c1..80135294d4 100644
--- a/addons/vector/stringtable.xml
+++ b/addons/vector/stringtable.xml
@@ -44,10 +44,10 @@
             <French>Vector - Touche Distance</French>
             <Polish>Vector - Odległość</Polish>
             <Czech>Vector - Zobrazit vzdálenost</Czech>
-            <Italian>Vecto - Tasto Distanza</Italian>
+            <Italian>Vector - Tasto Distanza</Italian>
             <Portuguese>Vector - Tecla de Distância</Portuguese>
             <Hungarian>Vector - Távolság gomb</Hungarian>
             <Russian>Vector – Расстояние</Russian>
         </Key>
     </Package>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml
index fc92b72dd2..f4162b3b03 100644
--- a/addons/vehiclelock/stringtable.xml
+++ b/addons/vehiclelock/stringtable.xml
@@ -10,7 +10,7 @@
             <Czech>Odemknout vozidlo</Czech>
             <Hungarian>Jármű nyitása</Hungarian>
             <Russian>Открыть машину</Russian>
-            <Italian>Apri il veicolo</Italian>
+            <Italian>Sblocca il veicolo</Italian>
             <Portuguese>Destravar veículo</Portuguese>
         </Key>
         <Key ID="STR_ACE_Vehicle_Action_Lock">
@@ -22,7 +22,7 @@
             <Czech>Zamknout vozidlo</Czech>
             <Hungarian>Jármű zárása</Hungarian>
             <Russian>Закрыть машину</Russian>
-            <Italian>Chiudi il veicolo</Italian>
+	    <Italian>Chiudi il veicolo a chiave</Italian>
             <Portuguese>Travar Veículo</Portuguese>
         </Key>
         <Key ID="STR_ACE_Vehicle_Action_Lockpick">
@@ -70,7 +70,7 @@
             <Czech>Hlavní klíč otevře libovolný zámek, bez vyjímek!</Czech>
             <Hungarian>Egy főkulcs, ami minden zárat kinyit, helyzettől függetlenül!</Hungarian>
             <Russian>Универсальный ключ, открывающий любой замок.</Russian>
-            <Italian>Una chiave principale che apre qualsiasi serratura!</Italian>
+            <Italian>Un passe-partout che apre qualsiasi serratura!</Italian>
             <Portuguese>Uma chave mestre irá abrir qualquer fechadura, não importa qual!</Portuguese>
         </Key>
         <Key ID="STR_ACE_Vehicle_Item_Lockpick_Description">
@@ -94,7 +94,7 @@
             <Czech>Klíč který by měl otevřít většinou Západních vozidel.</Czech>
             <Hungarian>Egy kulcs, ami a NYUGAT egységeinek legtöbb járművét ki tudja nyitni.</Hungarian>
             <Russian>Ключ для открытия большинства машин Красных.</Russian>
-            <Italian>Una chiave che apre la maggior parte dei veicoli WEST</Italian>
+            <Italian>Una chiave che apre la maggior parte dei veicoli occidentali</Italian>
             <Portuguese>Uma chave que abre a maioria dos veículos ocidentais</Portuguese>
         </Key>
         <Key ID="STR_ACE_Vehicle_Item_East_Description">
@@ -106,7 +106,7 @@
             <Hungarian>Egy kulcs, ami a KELET egységeinek legtöbb járművét ki tudja nyitni.</Hungarian>
             <Czech>Klíč který by měl otevřít vetšinu Východních vozidel.</Czech>
             <Russian>Ключ для открытия большинства машин Синих.</Russian>
-            <Italian>Una chaive che apre la maggior parte dei veicoli EAST</Italian>
+            <Italian>Una chaive che apre la maggior parte dei veicoli orientali</Italian>
             <Portuguese>Uma chave que abre a maioria dos veículos orientais</Portuguese>
         </Key>
         <Key ID="STR_ACE_Vehicle_Item_Indp_Description">
@@ -118,7 +118,7 @@
             <Hungarian>Egy kulcs, ami a FÜGGETLEN egységek legtöbb járművét ki tudja nyitni.</Hungarian>
             <Czech>Klíč který by měl otevřít většinu Nezávislých vozidel.</Czech>
             <Russian>Ключ для открытия большинства машин Независимых.</Russian>
-            <Italian>Una chaive che apr ela maggior parte dei veicoli INDEP</Italian>
+            <Italian>Una chaive che apr ela maggior parte dei veicoli degli indipendenti</Italian>
             <Portuguese>Uma chave que abre a maioria dos veículos independentes</Portuguese>
         </Key>
         <Key ID="STR_ACE_Vehicle_Item_Civ_Description">
@@ -130,8 +130,8 @@
             <Czech>Klíč který by měl otevřít většinu Civilních vozidel.</Czech>
             <Hungarian>Egy kulcs, ami a CIVIL járművek többségét ki tudja nyitni.</Hungarian>
             <Russian>Ключ для открытия большинства машин Гражданских.</Russian>
-            <Italian>Una chaive che apr ela maggior parte dei veicoli CIV</Italian>
+            <Italian>Una chaive che apr ela maggior parte dei veicoli civili</Italian>
             <Portuguese>Uma chave que abre a maioria dos veículos civis.</Portuguese>
         </Key>
     </Package>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/addons/weaponselect/stringtable.xml b/addons/weaponselect/stringtable.xml
index 2925b66e7d..0bce22becb 100644
--- a/addons/weaponselect/stringtable.xml
+++ b/addons/weaponselect/stringtable.xml
@@ -47,7 +47,7 @@
             <French>Sélectionner Fusil</French>
             <Hungarian>Puska Kiválasztása</Hungarian>
             <Portuguese>Selecionar Rifle</Portuguese>
-            <Italian>Seleziona il Fucile</Italian>
+            <Italian>Seleziona il fucile</Italian>
         </Key>
         <Key ID="STR_ACE_WeaponSelect_SelectLauncher">
             <English>Select Launcher</English>
@@ -59,7 +59,7 @@
             <French>Sélectionner Lanceur</French>
             <Hungarian>Rakétavető Kiválasztása</Hungarian>
             <Portuguese>Selecionar Lançador</Portuguese>
-            <Italian>Seleziona il Lanciamissili</Italian>
+            <Italian>Seleziona il lanciamissili</Italian>
         </Key>
         <Key ID="STR_ACE_WeaponSelect_SelectRifleMuzzle">
             <English>Select Grenade Launcher</English>
@@ -71,7 +71,7 @@
             <French>Sélectionner Lance-grenades</French>
             <Hungarian>Gránátvető Kiválasztása</Hungarian>
             <Portuguese>Selecionar Lança-Granadas</Portuguese>
-            <Italian>Seleziona il Lanciagranate</Italian>
+            <Italian>Seleziona il lanciagranate</Italian>
         </Key>
         <Key ID="STR_ACE_WeaponSelect_SelectBinocular">
             <English>Select Binoculars</English>
@@ -278,4 +278,4 @@
             <Portuguese>Lançador de fumaça</Portuguese>
         </Key>
     </Package>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/addons/winddeflection/stringtable.xml b/addons/winddeflection/stringtable.xml
index af6f05a912..4ebcc81bee 100644
--- a/addons/winddeflection/stringtable.xml
+++ b/addons/winddeflection/stringtable.xml
@@ -23,7 +23,7 @@
                 <French>Direction %1</French>
                 <German>Windrichtung: %1</German>
                 <Hungarian>Irány: %1</Hungarian>
-                <Italian>Direzione: %1</Italian>
+                <Italian>Direzione: %1°</Italian>
                 <Portuguese>Direção: %1</Portuguese>
             </Key>
             <Key ID="STR_ACE_WEATHER_METER_WIND_SPEED">