12 files changed, 766 insertions, 430 deletions

diff --git a/i18n/da/addressbook.ts b/i18n/da/addressbook.ts
index 72f27f0..3d7063e 100644
--- a/i18n/da/addressbook.ts
+++ b/i18n/da/addressbook.ts
@@ -113,20 +113,16 @@
 %1?</source>
         <translation>Er du sikker på du vil tilføje kontakten for %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Alle ja</translation>
     </message>
     <message>
-        <source>OContacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kan ikke redigere data da en synkronisering er igang</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Rediger adresse</translation>
     </message>
     <message>
@@ -332,17 +328,17 @@ Opie-Mail fås gratis!</translation>
         <translation>USA</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Storbritannien</translation>
     </message>
     <message>
         <source>Afganistan</source>
-        <translation>Afghanistan</translation>
+        <translation type="obsolete">Afghanistan</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanien</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algeriet</translation>
@@ -360,25 +356,25 @@ Opie-Mail fås gratis!</translation>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Antartica</source>
-        <translation>Antarktis</translation>
+        <translation type="obsolete">Antarktis</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Armania</source>
-        <translation>Armenien</translation>
+        <translation type="obsolete">Armenien</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australien</translation>
@@ -428,17 +424,17 @@ Opie-Mail fås gratis!</translation>
         <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Boliva</source>
-        <translation>Bolivia</translation>
+        <translation type="obsolete">Bolivia</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvetø</translation>
@@ -464,17 +460,17 @@ Opie-Mail fås gratis!</translation>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambodja</translation>
     </message>
     <message>
         <source>Camaroon</source>
-        <translation>Cameroun</translation>
+        <translation type="obsolete">Cameroun</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cape Verde</translation>
@@ -628,17 +624,17 @@ Opie-Mail fås gratis!</translation>
         <translation>Georgien</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Tyskland</translation>
     </message>
     <message>
         <source>Gahna</source>
-        <translation>Ghana</translation>
+        <translation type="obsolete">Ghana</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grækenland</translation>
@@ -648,33 +644,33 @@ Opie-Mail fås gratis!</translation>
         <translation>Grønland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guadelupe</source>
-        <translation>Guadeloupe</translation>
+        <translation type="obsolete">Guadeloupe</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
-        <translation>Guinea-Bissau</translation>
+        <translation type="obsolete">Guinea-Bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
@@ -716,17 +712,17 @@ Opie-Mail fås gratis!</translation>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italien</translation>
     </message>
     <message>
         <source>Jamacia</source>
-        <translation>Jamaica</translation>
+        <translation type="obsolete">Jamaica</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japan</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordan</translation>
@@ -736,29 +732,29 @@ Opie-Mail fås gratis!</translation>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenya</translation>
     </message>
     <message>
         <source>Kribati</source>
-        <translation>Kiribati</translation>
+        <translation type="obsolete">Kiribati</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Kyrgystan</source>
-        <translation>Kurgistan</translation>
+        <translation type="obsolete">Kurgistan</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Letland</translation>
@@ -924,17 +920,17 @@ Opie-Mail fås gratis!</translation>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
-        <translation>Palæstinensiske selvstyre områder</translation>
+        <translation type="obsolete">Palæstinensiske selvstyre områder</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Ny Guinea</translation>
@@ -948,17 +944,17 @@ Opie-Mail fås gratis!</translation>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filippinerne</translation>
     </message>
     <message>
         <source>Pitcairn</source>
-        <translation>Pitcairn</translation>
+        <translation type="obsolete">Pitcairn</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polen</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
@@ -1136,17 +1132,17 @@ Opie-Mail fås gratis!</translation>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Viet Nam</source>
-        <translation>Vietnam</translation>
+        <translation type="obsolete">Vietnam</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Vestindiske Øer</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Vestsahara</translation>
@@ -1222,16 +1218,72 @@ Opie-Mail fås gratis!</translation>
     <message>
         <source>Contacts</source>
         <translation>Kontakter</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
+    <message>
+        <source>Afghanistan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Antarctica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Armenia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bolivia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cameroon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guadeloupe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guinea-Bissau</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kiribati</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Palestinian Sovereign Areas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitcairn Islands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vietnam</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation>Arbejdstelefon</translation>
     </message>
     <message>
diff --git a/i18n/de/addressbook.ts b/i18n/de/addressbook.ts
index e429257..cf0b27a 100644
--- a/i18n/de/addressbook.ts
+++ b/i18n/de/addressbook.ts
@@ -110,17 +110,17 @@ Dennoch beenden?</translation>
         <translation>Daten speichern</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Konfigurations</translation>
     </message>
     <message>
         <source>OContacts</source>
-        <translation>OContacts</translation>
+        <translation type="obsolete">OContacts</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Nicht gefunden</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Liste</translation>
@@ -351,17 +351,17 @@ ist frei erhältlich !</translation>
         <translation>Vereinigte Staaten</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Grossbritannien</translation>
     </message>
     <message>
         <source>Afganistan</source>
-        <translation>Afganistan</translation>
+        <translation type="obsolete">Afganistan</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanien</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algerien</translation>
@@ -379,25 +379,25 @@ ist frei erhältlich !</translation>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Antartica</source>
-        <translation>Antarktis</translation>
+        <translation type="obsolete">Antarktis</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentinien</translation>
     </message>
     <message>
         <source>Armania</source>
-        <translation>Armenien</translation>
+        <translation type="obsolete">Armenien</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australien</translation>
@@ -447,17 +447,17 @@ ist frei erhältlich !</translation>
         <translation>Bermuda-Inseln</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Boliva</source>
-        <translation>Bolivien</translation>
+        <translation type="obsolete">Bolivien</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvet</translation>
@@ -483,17 +483,17 @@ ist frei erhältlich !</translation>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Kambodscha</translation>
     </message>
     <message>
         <source>Camaroon</source>
-        <translation>Kamerun</translation>
+        <translation type="obsolete">Kamerun</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Kap Verde</translation>
@@ -647,17 +647,17 @@ ist frei erhältlich !</translation>
         <translation>Georgien</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Deutschland</translation>
     </message>
     <message>
         <source>Gahna</source>
-        <translation>Ghana</translation>
+        <translation type="obsolete">Ghana</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Griechenland</translation>
@@ -667,33 +667,33 @@ ist frei erhältlich !</translation>
         <translation>Grönland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guadelupe</source>
-        <translation>Guadeloupe</translation>
+        <translation type="obsolete">Guadeloupe</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
-        <translation>Guinea-Bissau</translation>
+        <translation type="obsolete">Guinea-Bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
@@ -735,17 +735,17 @@ ist frei erhältlich !</translation>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italien</translation>
     </message>
     <message>
         <source>Jamacia</source>
-        <translation>Jamaica</translation>
+        <translation type="obsolete">Jamaica</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japan</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordanien</translation>
@@ -755,17 +755,17 @@ ist frei erhältlich !</translation>
         <translation>Kasachstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenja</translation>
     </message>
     <message>
         <source>Kribati</source>
-        <translation>Kiribati</translation>
+        <translation type="obsolete">Kiribati</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
@@ -935,17 +935,17 @@ ist frei erhältlich !</translation>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
-        <translation>Palästina</translation>
+        <translation type="obsolete">Palästina</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Neu Guinea</translation>
@@ -959,17 +959,17 @@ ist frei erhältlich !</translation>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Philippinen</translation>
     </message>
     <message>
         <source>Pitcairn</source>
-        <translation>Pitcairn</translation>
+        <translation type="obsolete">Pitcairn</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polen</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
@@ -1147,17 +1147,17 @@ ist frei erhältlich !</translation>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Viet Nam</source>
-        <translation>Vietnam</translation>
+        <translation type="obsolete">Vietnam</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Jungfraueninseln</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Westsahara</translation>
@@ -1211,26 +1211,82 @@ ist frei erhältlich !</translation>
         <translation>Kontakte</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Kyrgystan</source>
-        <translation>Kyrgystan</translation>
+        <translation type="obsolete">Kyrgystan</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
+    <message>
+        <source>Afghanistan</source>
+        <translation>Afghanistan</translation>
+    </message>
+    <message>
+        <source>Antarctica</source>
+        <translation>Antarktis</translation>
+    </message>
+    <message>
+        <source>Armenia</source>
+        <translation>Armenien</translation>
+    </message>
+    <message>
+        <source>Bolivia</source>
+        <translation>Bolivien</translation>
+    </message>
+    <message>
+        <source>Cameroon</source>
+        <translation>Kamerun</translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation>Ghana</translation>
+    </message>
+    <message>
+        <source>Guadeloupe</source>
+        <translation>Guadeloupe</translation>
+    </message>
+    <message>
+        <source>Guinea-Bissau</source>
+        <translation>Guinea-Bissau</translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation>Jamaika</translation>
+    </message>
+    <message>
+        <source>Kiribati</source>
+        <translation>Kiribati</translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation>Kyrgyzstan</translation>
+    </message>
+    <message>
+        <source>Palestinian Sovereign Areas</source>
+        <translation>Palestina</translation>
+    </message>
+    <message>
+        <source>Pitcairn Islands</source>
+        <translation>Pitcairn Inseln</translation>
+    </message>
+    <message>
+        <source>Vietnam</source>
+        <translation>Vietnam</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation>Telefon, geschäftlich</translation>
     </message>
     <message>
diff --git a/i18n/en/addressbook.ts b/i18n/en/addressbook.ts
index 07e577f..09f380a 100644
--- a/i18n/en/addressbook.ts
+++ b/i18n/en/addressbook.ts
@@ -104,20 +104,16 @@ Quit anyway?</source>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OContacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -385,20 +381,16 @@ is provided free !</source>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Afganistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -413,28 +405,20 @@ is provided free !</source>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Antartica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Armania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -481,20 +465,16 @@ is provided free !</source>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Boliva</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -517,20 +497,16 @@ is provided free !</source>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Camaroon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -669,56 +645,44 @@ is provided free !</source>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gahna</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Guadelupe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Guinea-bissau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -757,36 +721,28 @@ is provided free !</source>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jamacia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kribati</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -949,20 +905,16 @@ is provided free !</source>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Palestinian Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -973,20 +925,16 @@ is provided free !</source>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pitcairn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1161,20 +1109,16 @@ is provided free !</source>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Viet Nam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1201,25 +1145,77 @@ is provided free !</source>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Afghanistan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Antarctica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Armenia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bolivia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cameroon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guadeloupe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guinea-Bissau</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kiribati</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Palestinian Sovereign Areas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitcairn Islands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vietnam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/es/addressbook.ts b/i18n/es/addressbook.ts
index 21eb10a..b343a77 100644
--- a/i18n/es/addressbook.ts
+++ b/i18n/es/addressbook.ts
@@ -109,17 +109,17 @@ inténtelo de nuevo.
         <translation>Guardar datos</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>OContacts</source>
-        <translation>Contactos</translation>
+        <translation type="obsolete">Contactos</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Tarjetas</translation>
@@ -397,17 +397,17 @@ suministra gratis!</translation>
         <translation>Editar nombre</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Afganistan</source>
-        <translation>Afganistán</translation>
+        <translation type="obsolete">Afganistán</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albania</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Argelia</translation>
@@ -425,25 +425,25 @@ suministra gratis!</translation>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Antillas</translation>
     </message>
     <message>
         <source>Antartica</source>
-        <translation>Antártida</translation>
+        <translation type="obsolete">Antártida</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Armania</source>
-        <translation>Armenia</translation>
+        <translation type="obsolete">Armenia</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australia</translation>
@@ -493,17 +493,17 @@ suministra gratis!</translation>
         <translation>Bermudas</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhután</translation>
     </message>
     <message>
         <source>Boliva</source>
-        <translation>Boliva</translation>
+        <translation type="obsolete">Boliva</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Isla Bouvet</translation>
@@ -529,17 +529,17 @@ suministra gratis!</translation>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Camboya</translation>
     </message>
     <message>
         <source>Camaroon</source>
-        <translation>Camerun</translation>
+        <translation type="obsolete">Camerun</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cabo Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Islas Caimán</translation>
@@ -681,17 +681,17 @@ suministra gratis!</translation>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Gahna</source>
-        <translation>Gahna</translation>
+        <translation type="obsolete">Gahna</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grecia</translation>
@@ -701,33 +701,33 @@ suministra gratis!</translation>
         <translation>Groenlandia</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guadelupe</source>
-        <translation>Guadalupe</translation>
+        <translation type="obsolete">Guadalupe</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
-        <translation>Guinea-bissau</translation>
+        <translation type="obsolete">Guinea-bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guayana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
@@ -769,33 +769,33 @@ suministra gratis!</translation>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italia</translation>
     </message>
     <message>
         <source>Jamacia</source>
-        <translation>Jamaica</translation>
+        <translation type="obsolete">Jamaica</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordania</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenia</translation>
     </message>
     <message>
         <source>Kribati</source>
-        <translation>Kribati</translation>
+        <translation type="obsolete">Kribati</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
@@ -961,17 +961,17 @@ suministra gratis!</translation>
         <translation>Pakistán</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
-        <translation>Palestina</translation>
+        <translation type="obsolete">Palestina</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panamá</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papúa Nueva Guinea</translation>
@@ -985,17 +985,17 @@ suministra gratis!</translation>
         <translation>Perú</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipinas</translation>
     </message>
     <message>
         <source>Pitcairn</source>
-        <translation>Pitcairn</translation>
+        <translation type="obsolete">Pitcairn</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polonia</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
@@ -1173,17 +1173,17 @@ suministra gratis!</translation>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Viet Nam</source>
-        <translation>Vietnam</translation>
+        <translation type="obsolete">Vietnam</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Islas Vírgenes</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Sahara Occidental</translation>
@@ -1213,26 +1213,82 @@ suministra gratis!</translation>
         <translation>Aniversario</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Kyrgystan</source>
-        <translation>Kyrgystan</translation>
+        <translation type="obsolete">Kyrgystan</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
+    <message>
+        <source>Afghanistan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Antarctica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Armenia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bolivia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cameroon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guadeloupe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guinea-Bissau</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kiribati</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Palestinian Sovereign Areas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitcairn Islands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vietnam</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation>Tfno. trabajo</translation>
     </message>
     <message>
diff --git a/i18n/fr/addressbook.ts b/i18n/fr/addressbook.ts
index a8f4936..056a456 100644
--- a/i18n/fr/addressbook.ts
+++ b/i18n/fr/addressbook.ts
@@ -109,20 +109,16 @@ Quitter ?</translation>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OContacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -391,17 +387,17 @@ is provided free !</source>
         <translation>Editer le nom</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contacts</translation>
     </message>
     <message>
         <source>Afganistan</source>
-        <translation>Afganistan</translation>
+        <translation type="obsolete">Afganistan</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanie</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algérie</translation>
@@ -419,25 +415,25 @@ is provided free !</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Antartica</source>
-        <translation>Antartique</translation>
+        <translation type="obsolete">Antartique</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentine</translation>
     </message>
     <message>
         <source>Armania</source>
-        <translation>Arménie</translation>
+        <translation type="obsolete">Arménie</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australie</translation>
@@ -487,17 +483,17 @@ is provided free !</source>
         <translation>Bermudes</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhoutan</translation>
     </message>
     <message>
         <source>Boliva</source>
-        <translation>Bolivie</translation>
+        <translation type="obsolete">Bolivie</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Ile Bouvet</translation>
@@ -523,17 +519,17 @@ is provided free !</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambodge</translation>
     </message>
     <message>
         <source>Camaroon</source>
-        <translation>Cameroun</translation>
+        <translation type="obsolete">Cameroun</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cap Vert</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Iles Cayman</translation>
@@ -675,17 +671,17 @@ is provided free !</source>
         <translation>Gambie</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgie</translation>
     </message>
     <message>
         <source>Gahna</source>
-        <translation>Gahna</translation>
+        <translation type="obsolete">Gahna</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltare</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grèce</translation>
@@ -695,33 +691,33 @@ is provided free !</source>
         <translation>Greenland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenade</translation>
     </message>
     <message>
         <source>Guadelupe</source>
-        <translation>Guadeloupe</translation>
+        <translation type="obsolete">Guadeloupe</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinée</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
-        <translation>Guinée Bissau</translation>
+        <translation type="obsolete">Guinée Bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyane</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haïti</translation>
@@ -763,33 +759,33 @@ is provided free !</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italie</translation>
     </message>
     <message>
         <source>Jamacia</source>
-        <translation>Jamaïque</translation>
+        <translation type="obsolete">Jamaïque</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordanie</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kénya</translation>
     </message>
     <message>
         <source>Kribati</source>
-        <translation>Kribati</translation>
+        <translation type="obsolete">Kribati</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Corée</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
@@ -955,17 +951,17 @@ is provided free !</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Belau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
-        <translation>Palestine</translation>
+        <translation type="obsolete">Palestine</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papouasie Nouvelle Guinée</translation>
@@ -979,17 +975,17 @@ is provided free !</source>
         <translation>Pérou</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Philippines</translation>
     </message>
     <message>
         <source>Pitcairn</source>
-        <translation>Pitcairn</translation>
+        <translation type="obsolete">Pitcairn</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Pologne</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
@@ -1167,17 +1163,17 @@ is provided free !</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Vénézuela</translation>
     </message>
     <message>
         <source>Viet Nam</source>
-        <translation>Viet Nam</translation>
+        <translation type="obsolete">Viet Nam</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Iles Vierges</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Sahara Occidental</translation>
@@ -1206,27 +1202,79 @@ is provided free !</source>
         <source>Anniversary</source>
         <translation>Anniversaire</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Supprimer</translation>
     </message>
+    <message>
+        <source>Afghanistan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Antarctica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Armenia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bolivia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cameroon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guadeloupe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guinea-Bissau</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kiribati</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Palestinian Sovereign Areas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitcairn Islands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vietnam</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished">Téléphone (Bureau)</translation>
     </message>
     <message>
diff --git a/i18n/it/addressbook.ts b/i18n/it/addressbook.ts
index b853c68..04579a9 100644
--- a/i18n/it/addressbook.ts
+++ b/i18n/it/addressbook.ts
@@ -97,17 +97,17 @@ Uscire comunque?</translation>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vuota</translation>
     </message>
     <message>
         <source>OContacts</source>
-        <translation>OContatti</translation>
+        <translation type="obsolete">OContatti</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Cartellini</translation>
@@ -346,17 +346,17 @@ is provided free !</source>
         <translation>Stati Uniti</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Regno Unito</translation>
     </message>
     <message>
         <source>Afganistan</source>
-        <translation>Afganistan</translation>
+        <translation type="obsolete">Afganistan</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albania</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algeria</translation>
@@ -374,25 +374,25 @@ is provided free !</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Antartica</source>
-        <translation>Antartica</translation>
+        <translation type="obsolete">Antartica</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Armania</source>
-        <translation>Armania</translation>
+        <translation type="obsolete">Armania</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australia</translation>
@@ -442,17 +442,17 @@ is provided free !</source>
         <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Boliva</source>
-        <translation>Bolivia</translation>
+        <translation type="obsolete">Bolivia</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvet Island</translation>
@@ -478,17 +478,17 @@ is provided free !</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambogia</translation>
     </message>
     <message>
         <source>Camaroon</source>
-        <translation>Camerun</translation>
+        <translation type="obsolete">Camerun</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Capo Verde</translation>
@@ -642,17 +642,17 @@ is provided free !</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Germania</translation>
     </message>
     <message>
         <source>Gahna</source>
-        <translation>Gahna</translation>
+        <translation type="obsolete">Gahna</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibilterra</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grecia</translation>
@@ -662,33 +662,33 @@ is provided free !</source>
         <translation>Groenlandia</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guadelupe</source>
-        <translation>Guadalupe</translation>
+        <translation type="obsolete">Guadalupe</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
-        <translation>Guinea-bissau</translation>
+        <translation type="obsolete">Guinea-bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
@@ -730,17 +730,17 @@ is provided free !</source>
         <translation>Israele</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italia</translation>
     </message>
     <message>
         <source>Jamacia</source>
-        <translation>Giamaica</translation>
+        <translation type="obsolete">Giamaica</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Giappone</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Giordania</translation>
@@ -750,17 +750,17 @@ is provided free !</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenya</translation>
     </message>
     <message>
         <source>Kribati</source>
-        <translation>Kribati</translation>
+        <translation type="obsolete">Kribati</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
@@ -930,17 +930,17 @@ is provided free !</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
-        <translation>Territorio Palestinese</translation>
+        <translation type="obsolete">Territorio Palestinese</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Nuova Guinea</translation>
@@ -954,17 +954,17 @@ is provided free !</source>
         <translation>Perù</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filippine</translation>
     </message>
     <message>
         <source>Pitcairn</source>
-        <translation>Pitcairn</translation>
+        <translation type="obsolete">Pitcairn</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polonia</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portogallo</translation>
@@ -1142,17 +1142,17 @@ is provided free !</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Viet Nam</source>
-        <translation>Viet Nam</translation>
+        <translation type="obsolete">Viet Nam</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Isole Vergini</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Western Sahara</translation>
@@ -1206,26 +1206,82 @@ is provided free !</source>
         <translation>Contatti</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Kyrgystan</source>
-        <translation>Kyrgystan</translation>
+        <translation type="obsolete">Kyrgystan</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Cancella Contatto</translation>
     </message>
+    <message>
+        <source>Afghanistan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Antarctica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Armenia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bolivia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cameroon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guadeloupe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guinea-Bissau</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kiribati</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Palestinian Sovereign Areas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitcairn Islands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vietnam</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished">Telefono Ufficio</translation>
     </message>
     <message>
diff --git a/i18n/pl/addressbook.ts b/i18n/pl/addressbook.ts
index db0be51..65aec6d 100644
--- a/i18n/pl/addressbook.ts
+++ b/i18n/pl/addressbook.ts
@@ -108,20 +108,16 @@ Zakonczyc?</translation>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OContacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -345,20 +341,16 @@ is provided free !</source>
         <source>United States</source>
         <translation>Stany Zjednoczone</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Anglia</translation>
     </message>
     <message>
-        <source>Afganistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -373,28 +365,20 @@ is provided free !</source>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Antartica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Armania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -441,20 +425,16 @@ is provided free !</source>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Boliva</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -477,20 +457,16 @@ is provided free !</source>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Camaroon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -641,56 +617,44 @@ is provided free !</source>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gahna</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Guadelupe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Guinea-bissau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -729,40 +693,32 @@ is provided free !</source>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jamacia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kribati</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -929,20 +885,16 @@ is provided free !</source>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Palestinian Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -953,20 +905,16 @@ is provided free !</source>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pitcairn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Poland</source>
         <translation>Polska</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1141,20 +1089,16 @@ is provided free !</source>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Viet Nam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1205,27 +1149,79 @@ is provided free !</source>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Usun</translation>
     </message>
+    <message>
+        <source>Afghanistan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Antarctica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Armenia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bolivia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cameroon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guadeloupe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guinea-Bissau</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kiribati</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Palestinian Sovereign Areas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitcairn Islands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vietnam</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt/addressbook.ts b/i18n/pt/addressbook.ts
index 257b809..68e51aa 100644
--- a/i18n/pt/addressbook.ts
+++ b/i18n/pt/addressbook.ts
@@ -108,20 +108,16 @@ Sair na mesma?</translation>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OContacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -390,17 +386,17 @@ is provided free !</source>
         <translation>Editar Nome</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Afganistan</source>
-        <translation>Afeganistão</translation>
+        <translation type="obsolete">Afeganistão</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albânia</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algéria</translation>
@@ -418,25 +414,25 @@ is provided free !</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Antartica</source>
-        <translation>Antártida</translation>
+        <translation type="obsolete">Antártida</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argetina</translation>
     </message>
     <message>
         <source>Armania</source>
-        <translation>Armânia</translation>
+        <translation type="obsolete">Armânia</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Austrália</translation>
@@ -486,17 +482,17 @@ is provided free !</source>
         <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutam</translation>
     </message>
     <message>
         <source>Boliva</source>
-        <translation>Bolívia</translation>
+        <translation type="obsolete">Bolívia</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
@@ -522,17 +518,17 @@ is provided free !</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambodja</translation>
     </message>
     <message>
         <source>Camaroon</source>
-        <translation>Camarões</translation>
+        <translation type="obsolete">Camarões</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cabo Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Ilhas Caiman</translation>
@@ -673,20 +669,16 @@ is provided free !</source>
         <source>Gambia</source>
         <translation>Gâmbia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
-        <source>Gahna</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grécia</translation>
     </message>
     <message>
@@ -694,33 +686,33 @@ is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guadelupe</source>
-        <translation>Guadalupe</translation>
+        <translation type="obsolete">Guadalupe</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guiné</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
-        <translation>Guiné-Bissau</translation>
+        <translation type="obsolete">Guiné-Bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
@@ -762,35 +754,31 @@ is provided free !</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Itália</translation>
     </message>
     <message>
         <source>Jamacia</source>
-        <translation>Jamaica</translation>
+        <translation type="obsolete">Jamaica</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordania</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Casaquistão</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Quénia</translation>
     </message>
     <message>
-        <source>Kribati</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Korea</source>
         <translation>Coreia</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -954,17 +942,17 @@ is provided free !</source>
         <translation>Paquistão</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
-        <translation>Território Palestino</translation>
+        <translation type="obsolete">Território Palestino</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panamá</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
@@ -977,20 +965,16 @@ is provided free !</source>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipinas</translation>
     </message>
     <message>
-        <source>Pitcairn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Poland</source>
         <translation>Polónia</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
@@ -1166,17 +1150,17 @@ is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Viet Nam</source>
-        <translation>Vietnam</translation>
+        <translation type="obsolete">Vietnam</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
@@ -1205,27 +1189,79 @@ is provided free !</source>
         <source>Anniversary</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Apagar</translation>
     </message>
+    <message>
+        <source>Afghanistan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Antarctica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Armenia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bolivia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cameroon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guadeloupe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guinea-Bissau</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kiribati</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Palestinian Sovereign Areas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitcairn Islands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vietnam</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished">Telefone (Empresa)</translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/addressbook.ts b/i18n/pt_BR/addressbook.ts
index 0679740..6c359ae 100644
--- a/i18n/pt_BR/addressbook.ts
+++ b/i18n/pt_BR/addressbook.ts
@@ -109,20 +109,16 @@ Sair assim mesmo?</translation>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OContacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -390,20 +386,16 @@ is provided free !</source>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">Contatos</translation>
     </message>
     <message>
-        <source>Afganistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -418,28 +410,20 @@ is provided free !</source>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Antartica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Armania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -486,20 +470,16 @@ is provided free !</source>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Boliva</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -522,20 +502,16 @@ is provided free !</source>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Camaroon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -674,56 +650,44 @@ is provided free !</source>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gahna</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Guadelupe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Guinea-bissau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -762,36 +726,28 @@ is provided free !</source>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jamacia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kribati</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -954,20 +910,16 @@ is provided free !</source>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Palestinian Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -978,20 +930,16 @@ is provided free !</source>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pitcairn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1166,20 +1114,16 @@ is provided free !</source>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Viet Nam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1206,27 +1150,79 @@ is provided free !</source>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Apagar</translation>
     </message>
+    <message>
+        <source>Afghanistan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Antarctica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Armenia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bolivia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cameroon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guadeloupe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guinea-Bissau</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kiribati</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Palestinian Sovereign Areas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitcairn Islands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vietnam</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/sl/addressbook.ts b/i18n/sl/addressbook.ts
index ec1711c..72bcb38 100644
--- a/i18n/sl/addressbook.ts
+++ b/i18n/sl/addressbook.ts
@@ -108,20 +108,16 @@ Izhod?</translation>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OContacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -390,17 +386,17 @@ is provided free !</source>
         <translation>Uredi ime</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Stiki</translation>
     </message>
     <message>
         <source>Afganistan</source>
-        <translation>Afganistan</translation>
+        <translation type="obsolete">Afganistan</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanija</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Alžirija</translation>
@@ -418,25 +414,25 @@ is provided free !</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Antartica</source>
-        <translation>Antartika</translation>
+        <translation type="obsolete">Antartika</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Armania</source>
-        <translation>Armanija</translation>
+        <translation type="obsolete">Armanija</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Avstralija</translation>
@@ -486,17 +482,17 @@ is provided free !</source>
         <translation>Bermudi</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Boliva</source>
-        <translation>Bolivija</translation>
+        <translation type="obsolete">Bolivija</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvetski otoki</translation>
@@ -522,17 +518,17 @@ is provided free !</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Kambodža</translation>
     </message>
     <message>
         <source>Camaroon</source>
-        <translation>Kamerun</translation>
+        <translation type="obsolete">Kamerun</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cape Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Kajmanovi otoki</translation>
@@ -674,17 +670,17 @@ is provided free !</source>
         <translation>Gambija</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Džordžija </translation>
     </message>
     <message>
         <source>Gahna</source>
-        <translation>Gana</translation>
+        <translation type="obsolete">Gana</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grčija</translation>
@@ -694,33 +690,33 @@ is provided free !</source>
         <translation>Grenlandija</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guadelupe</source>
-        <translation>Gvadelup</translation>
+        <translation type="obsolete">Gvadelup</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Gvatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Gvineja</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
-        <translation>Guinea-bissau</translation>
+        <translation type="obsolete">Guinea-bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Gujana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
@@ -762,33 +758,33 @@ is provided free !</source>
         <translation>Izrael</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italija</translation>
     </message>
     <message>
         <source>Jamacia</source>
-        <translation>Jamajka</translation>
+        <translation type="obsolete">Jamajka</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordan</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenija</translation>
     </message>
     <message>
         <source>Kribati</source>
-        <translation>Kribati</translation>
+        <translation type="obsolete">Kribati</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Koreja</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
@@ -954,17 +950,17 @@ is provided free !</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
-        <translation>Palestinsko ozemlje</translation>
+        <translation type="obsolete">Palestinsko ozemlje</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papva Nova Gvineja</translation>
@@ -978,17 +974,17 @@ is provided free !</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipini</translation>
     </message>
     <message>
         <source>Pitcairn</source>
-        <translation>Pitcairn</translation>
+        <translation type="obsolete">Pitcairn</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polska</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugalska</translation>
@@ -1166,17 +1162,17 @@ is provided free !</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Viet Nam</source>
-        <translation>Viet Nam</translation>
+        <translation type="obsolete">Viet Nam</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Deviški Otoki</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Zahodna Sahara</translation>
@@ -1206,26 +1202,82 @@ is provided free !</source>
         <translation>Obletnica</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuvajt</translation>
     </message>
     <message>
         <source>Kyrgystan</source>
-        <translation>Kyrgystan</translation>
+        <translation type="obsolete">Kyrgystan</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Izbriši</translation>
     </message>
+    <message>
+        <source>Afghanistan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Antarctica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Armenia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bolivia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cameroon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guadeloupe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guinea-Bissau</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kiribati</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Palestinian Sovereign Areas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitcairn Islands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vietnam</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished">Službeni telefon</translation>
     </message>
     <message>
diff --git a/i18n/xx/addressbook.ts b/i18n/xx/addressbook.ts
index 4a0cf9f..d8746f1 100644
--- a/i18n/xx/addressbook.ts
+++ b/i18n/xx/addressbook.ts
@@ -111,20 +111,16 @@
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OContacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -321,20 +317,16 @@ is provided free !</source>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Afganistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -349,28 +341,20 @@ is provided free !</source>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Antartica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Armania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -417,20 +401,16 @@ is provided free !</source>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Boliva</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -453,20 +433,16 @@ is provided free !</source>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Camaroon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -617,56 +593,44 @@ is provided free !</source>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gahna</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Guadelupe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Guinea-bissau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -705,52 +669,40 @@ is provided free !</source>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jamacia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kribati</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -913,20 +865,16 @@ is provided free !</source>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Palestinian Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -937,20 +885,16 @@ is provided free !</source>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pitcairn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1125,20 +1069,16 @@ is provided free !</source>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Viet Nam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1212,16 +1152,72 @@ is provided free !</source>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Afghanistan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Antarctica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Armenia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bolivia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cameroon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guadeloupe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guinea-Bissau</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kiribati</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Palestinian Sovereign Areas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitcairn Islands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vietnam</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/addressbook.ts b/i18n/zh_TW/addressbook.ts
index 07e577f..09f380a 100644
--- a/i18n/zh_TW/addressbook.ts
+++ b/i18n/zh_TW/addressbook.ts
@@ -104,20 +104,16 @@ Quit anyway?</source>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OContacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -385,20 +381,16 @@ is provided free !</source>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Afganistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -413,28 +405,20 @@ is provided free !</source>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Antartica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Armania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -481,20 +465,16 @@ is provided free !</source>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Boliva</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -517,20 +497,16 @@ is provided free !</source>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Camaroon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -669,56 +645,44 @@ is provided free !</source>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gahna</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Guadelupe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Guinea-bissau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -757,36 +721,28 @@ is provided free !</source>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jamacia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kribati</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -949,20 +905,16 @@ is provided free !</source>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Palestinian Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -973,20 +925,16 @@ is provided free !</source>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pitcairn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1161,20 +1109,16 @@ is provided free !</source>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Viet Nam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1201,25 +1145,77 @@ is provided free !</source>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Afghanistan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Antarctica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Armenia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bolivia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cameroon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guadeloupe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guinea-Bissau</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kiribati</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Palestinian Sovereign Areas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitcairn Islands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vietnam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>