Fix some typos, as usual: found by Tais (tm)

-		QMessageBox::warning(this, tr("OContacts"),
+		QMessageBox::warning(this, tr("Contacts"),
-	cmbCountry->insertItem( tr ( "Afganistan" ) );
+	cmbCountry->insertItem( tr ( "Afghanistan" ) );
-	cmbCountry->insertItem( tr ( "Antartica" ) );
+	cmbCountry->insertItem( tr ( "Antarctica" ) );
-	cmbCountry->insertItem( tr ( "Armania" ) );
+	cmbCountry->insertItem( tr ( "Armenia" ) );
-	cmbCountry->insertItem( tr ( "Boliva" ) );
+	cmbCountry->insertItem( tr ( "Bolivia" ) );
-	cmbCountry->insertItem( tr ( "Camaroon" ) );
+	cmbCountry->insertItem( tr ( "Cameroon" ) );
-	cmbCountry->insertItem( tr ( "Gahna" ) );
+	cmbCountry->insertItem( tr ( "Ghana" ) );
-	cmbCountry->insertItem( tr ( "Guadelupe" ) );
+	cmbCountry->insertItem( tr ( "Guadeloupe" ) );
-	cmbCountry->insertItem( tr ( "Guinea-bissau" ) );
+	cmbCountry->insertItem( tr ( "Guinea-Bissau" ) );
-	cmbCountry->insertItem( tr ( "Jamacia" ) );
+	cmbCountry->insertItem( tr ( "Jamaica" ) );
-	cmbCountry->insertItem( tr ( "Kribati" ) );
+	cmbCountry->insertItem( tr ( "Kiribati" ) );
-	cmbCountry->insertItem( tr ( "Kyrgystan" ) );
+	cmbCountry->insertItem( tr ( "Kyrgyzstan" ) );
-	cmbCountry->insertItem( tr ( "Palestinian Territory" ) );
+	cmbCountry->insertItem( tr ( "Palestinian Sovereign Areas" ) );
-	cmbCountry->insertItem( tr ( "Pitcairn" ) );
+	cmbCountry->insertItem( tr ( "Pitcairn Islands" ) );
-	cmbCountry->insertItem( tr ( "Viet Nam" ) );
+	cmbCountry->insertItem( tr ( "Vietnam" ) );

2 files changed, 15 insertions, 15 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index ea87e51..8888611 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -418,9 +418,9 @@ void AddressbookWindow::slotListNew()
 	OContact cnt;
 	if( !syncing ) {
 		editEntry( NewEntry );
 	} else {
-		QMessageBox::warning(this, tr("OContacts"),
+		QMessageBox::warning(this, tr("Contacts"),
 				     tr("Can not edit data, currently syncing"));
 	}
 }
 
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index b68d88c..c5ad0c4 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -233,18 +233,18 @@ void ContactEditor::init() {
 	cmbCountry = new QComboBox( TRUE, container );
 	cmbCountry->insertItem( tr( "" ) );
 	cmbCountry->insertItem( tr ( "United States" ) );
 	cmbCountry->insertItem( tr ( "United Kingdom" ) );
-	cmbCountry->insertItem( tr ( "Afganistan" ) );
+	cmbCountry->insertItem( tr ( "Afghanistan" ) );
 	cmbCountry->insertItem( tr ( "Albania" ) );
 	cmbCountry->insertItem( tr ( "Algeria" ) );
 	cmbCountry->insertItem( tr ( "American Samoa" ) );
 	cmbCountry->insertItem( tr ( "Andorra" ) );
 	cmbCountry->insertItem( tr ( "Angola" ) );
 	cmbCountry->insertItem( tr ( "Anguilla" ) );
-	cmbCountry->insertItem( tr ( "Antartica" ) );
+	cmbCountry->insertItem( tr ( "Antarctica" ) );
 	cmbCountry->insertItem( tr ( "Argentina" ) );
-	cmbCountry->insertItem( tr ( "Armania" ) );
+	cmbCountry->insertItem( tr ( "Armenia" ) );
 	cmbCountry->insertItem( tr ( "Aruba" ) );
 	cmbCountry->insertItem( tr ( "Australia" ) );
 	cmbCountry->insertItem( tr ( "Austria" ) );
 	cmbCountry->insertItem( tr ( "Azerbaijan" ) );
@@ -257,18 +257,18 @@ void ContactEditor::init() {
 	cmbCountry->insertItem( tr ( "Belize" ) );
 	cmbCountry->insertItem( tr ( "Benin" ) );
 	cmbCountry->insertItem( tr ( "Bermuda" ) );
 	cmbCountry->insertItem( tr ( "Bhutan" ) );
-	cmbCountry->insertItem( tr ( "Boliva" ) );
+	cmbCountry->insertItem( tr ( "Bolivia" ) );
 	cmbCountry->insertItem( tr ( "Botswana" ) );
 	cmbCountry->insertItem( tr ( "Bouvet Island" ) );
 	cmbCountry->insertItem( tr ( "Brazil" ) );
 	cmbCountry->insertItem( tr ( "Brunei Darussalam" ) );
 	cmbCountry->insertItem( tr ( "Bulgaria" ) );
 	cmbCountry->insertItem( tr ( "Burkina Faso" ) );
 	cmbCountry->insertItem( tr ( "Burundi" ) );
 	cmbCountry->insertItem( tr ( "Cambodia" ) );
-	cmbCountry->insertItem( tr ( "Camaroon" ) );
+	cmbCountry->insertItem( tr ( "Cameroon" ) );
 	cmbCountry->insertItem( tr ( "Canada" ) );
 	cmbCountry->insertItem( tr ( "Cape Verde" ) );
 	cmbCountry->insertItem( tr ( "Cayman Islands" ) );
 	cmbCountry->insertItem( tr ( "Chad" ) );
@@ -307,18 +307,18 @@ void ContactEditor::init() {
 	cmbCountry->insertItem( tr ( "Gabon" ) );
 	cmbCountry->insertItem( tr ( "Gambia" ) );
 	cmbCountry->insertItem( tr ( "Georgia" ) );
 	cmbCountry->insertItem( tr ( "Germany" ) );
-	cmbCountry->insertItem( tr ( "Gahna" ) );
+	cmbCountry->insertItem( tr ( "Ghana" ) );
 	cmbCountry->insertItem( tr ( "Gibraltar" ) );
 	cmbCountry->insertItem( tr ( "Greece" ) );
 	cmbCountry->insertItem( tr ( "Greenland" ) );
 	cmbCountry->insertItem( tr ( "Grenada" ) );
-	cmbCountry->insertItem( tr ( "Guadelupe" ) );
+	cmbCountry->insertItem( tr ( "Guadeloupe" ) );
 	cmbCountry->insertItem( tr ( "Guam" ) );
 	cmbCountry->insertItem( tr ( "Guatemala" ) );
 	cmbCountry->insertItem( tr ( "Guinea" ) );
-	cmbCountry->insertItem( tr ( "Guinea-bissau" ) );
+	cmbCountry->insertItem( tr ( "Guinea-Bissau" ) );
 	cmbCountry->insertItem( tr ( "Guyana" ) );
 	cmbCountry->insertItem( tr ( "Haiti" ) );
 	cmbCountry->insertItem( tr ( "Holy See" ) );
 	cmbCountry->insertItem( tr ( "Honduras" ) );
@@ -329,17 +329,17 @@ void ContactEditor::init() {
 	cmbCountry->insertItem( tr ( "Indonesia" ) );
 	cmbCountry->insertItem( tr ( "Ireland" ) );
 	cmbCountry->insertItem( tr ( "Israel" ) );
 	cmbCountry->insertItem( tr ( "Italy" ) );
-	cmbCountry->insertItem( tr ( "Jamacia" ) );
+	cmbCountry->insertItem( tr ( "Jamaica" ) );
 	cmbCountry->insertItem( tr ( "Japan" ) );
 	cmbCountry->insertItem( tr ( "Jordan" ) );
 	cmbCountry->insertItem( tr ( "Kazakhstan" ) );
 	cmbCountry->insertItem( tr ( "Kenya" ) );
-	cmbCountry->insertItem( tr ( "Kribati" ) );
+	cmbCountry->insertItem( tr ( "Kiribati" ) );
 	cmbCountry->insertItem( tr ( "Korea" ) );
 	cmbCountry->insertItem( tr ( "Kuwait" ) );
-	cmbCountry->insertItem( tr ( "Kyrgystan" ) );
+	cmbCountry->insertItem( tr ( "Kyrgyzstan" ) );
 	cmbCountry->insertItem( tr ( "Laos" ) );
 	cmbCountry->insertItem( tr ( "Latvia" ) );
 	cmbCountry->insertItem( tr ( "Lebanon" ) );
 	cmbCountry->insertItem( tr ( "Lesotho" ) );
@@ -381,15 +381,15 @@ void ContactEditor::init() {
 	cmbCountry->insertItem( tr ( "Norway" ) );
 	cmbCountry->insertItem( tr ( "Oman" ) );
 	cmbCountry->insertItem( tr ( "Pakistan" ) );
 	cmbCountry->insertItem( tr ( "Palau" ) );
-	cmbCountry->insertItem( tr ( "Palestinian Territory" ) );
+	cmbCountry->insertItem( tr ( "Palestinian Sovereign Areas" ) );
 	cmbCountry->insertItem( tr ( "Panama" ) );
 	cmbCountry->insertItem( tr ( "Papua New Guinea" ) );
 	cmbCountry->insertItem( tr ( "Paraguay" ) );
 	cmbCountry->insertItem( tr ( "Peru" ) );
 	cmbCountry->insertItem( tr ( "Philippines" ) );
-	cmbCountry->insertItem( tr ( "Pitcairn" ) );
+	cmbCountry->insertItem( tr ( "Pitcairn Islands" ) );
 	cmbCountry->insertItem( tr ( "Poland" ) );
 	cmbCountry->insertItem( tr ( "Portugal" ) );
 	cmbCountry->insertItem( tr ( "Puerto Rico" ) );
 	cmbCountry->insertItem( tr ( "Qatar" ) );
@@ -434,9 +434,9 @@ void ContactEditor::init() {
 	cmbCountry->insertItem( tr ( "Uruguay" ) );
 	cmbCountry->insertItem( tr ( "Uzbekistan" ) );
 	cmbCountry->insertItem( tr ( "Vanuatu" ) );
 	cmbCountry->insertItem( tr ( "Venezuela" ) );
-	cmbCountry->insertItem( tr ( "Viet Nam" ) );
+	cmbCountry->insertItem( tr ( "Vietnam" ) );
 	cmbCountry->insertItem( tr ( "Virgin Islands" ) );
 	cmbCountry->insertItem( tr ( "Western Sahara" ) );
 	cmbCountry->insertItem( tr ( "Yemen" ) );
 	cmbCountry->insertItem( tr ( "Yugoslavia" ) );