summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/addressbook/addressbook.cpp2
-rw-r--r--core/pim/addressbook/contacteditor.cpp28
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
@@ -419,7 +419,7 @@ void AddressbookWindow::slotListNew()
419 if( !syncing ) { 419 if( !syncing ) {
420 editEntry( NewEntry ); 420 editEntry( NewEntry );
421 } else { 421 } else {
422 QMessageBox::warning(this, tr("OContacts"), 422 QMessageBox::warning(this, tr("Contacts"),
423 tr("Can not edit data, currently syncing")); 423 tr("Can not edit data, currently syncing"));
424 } 424 }
425} 425}
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
@@ -234,16 +234,16 @@ void ContactEditor::init() {
234 cmbCountry->insertItem( tr( "" ) ); 234 cmbCountry->insertItem( tr( "" ) );
235 cmbCountry->insertItem( tr ( "United States" ) ); 235 cmbCountry->insertItem( tr ( "United States" ) );
236 cmbCountry->insertItem( tr ( "United Kingdom" ) ); 236 cmbCountry->insertItem( tr ( "United Kingdom" ) );
237 cmbCountry->insertItem( tr ( "Afganistan" ) ); 237 cmbCountry->insertItem( tr ( "Afghanistan" ) );
238 cmbCountry->insertItem( tr ( "Albania" ) ); 238 cmbCountry->insertItem( tr ( "Albania" ) );
239 cmbCountry->insertItem( tr ( "Algeria" ) ); 239 cmbCountry->insertItem( tr ( "Algeria" ) );
240 cmbCountry->insertItem( tr ( "American Samoa" ) ); 240 cmbCountry->insertItem( tr ( "American Samoa" ) );
241 cmbCountry->insertItem( tr ( "Andorra" ) ); 241 cmbCountry->insertItem( tr ( "Andorra" ) );
242 cmbCountry->insertItem( tr ( "Angola" ) ); 242 cmbCountry->insertItem( tr ( "Angola" ) );
243 cmbCountry->insertItem( tr ( "Anguilla" ) ); 243 cmbCountry->insertItem( tr ( "Anguilla" ) );
244 cmbCountry->insertItem( tr ( "Antartica" ) ); 244 cmbCountry->insertItem( tr ( "Antarctica" ) );
245 cmbCountry->insertItem( tr ( "Argentina" ) ); 245 cmbCountry->insertItem( tr ( "Argentina" ) );
246 cmbCountry->insertItem( tr ( "Armania" ) ); 246 cmbCountry->insertItem( tr ( "Armenia" ) );
247 cmbCountry->insertItem( tr ( "Aruba" ) ); 247 cmbCountry->insertItem( tr ( "Aruba" ) );
248 cmbCountry->insertItem( tr ( "Australia" ) ); 248 cmbCountry->insertItem( tr ( "Australia" ) );
249 cmbCountry->insertItem( tr ( "Austria" ) ); 249 cmbCountry->insertItem( tr ( "Austria" ) );
@@ -258,7 +258,7 @@ void ContactEditor::init() {
258 cmbCountry->insertItem( tr ( "Benin" ) ); 258 cmbCountry->insertItem( tr ( "Benin" ) );
259 cmbCountry->insertItem( tr ( "Bermuda" ) ); 259 cmbCountry->insertItem( tr ( "Bermuda" ) );
260 cmbCountry->insertItem( tr ( "Bhutan" ) ); 260 cmbCountry->insertItem( tr ( "Bhutan" ) );
261 cmbCountry->insertItem( tr ( "Boliva" ) ); 261 cmbCountry->insertItem( tr ( "Bolivia" ) );
262 cmbCountry->insertItem( tr ( "Botswana" ) ); 262 cmbCountry->insertItem( tr ( "Botswana" ) );
263 cmbCountry->insertItem( tr ( "Bouvet Island" ) ); 263 cmbCountry->insertItem( tr ( "Bouvet Island" ) );
264 cmbCountry->insertItem( tr ( "Brazil" ) ); 264 cmbCountry->insertItem( tr ( "Brazil" ) );
@@ -267,7 +267,7 @@ void ContactEditor::init() {
267 cmbCountry->insertItem( tr ( "Burkina Faso" ) ); 267 cmbCountry->insertItem( tr ( "Burkina Faso" ) );
268 cmbCountry->insertItem( tr ( "Burundi" ) ); 268 cmbCountry->insertItem( tr ( "Burundi" ) );
269 cmbCountry->insertItem( tr ( "Cambodia" ) ); 269 cmbCountry->insertItem( tr ( "Cambodia" ) );
270 cmbCountry->insertItem( tr ( "Camaroon" ) ); 270 cmbCountry->insertItem( tr ( "Cameroon" ) );
271 cmbCountry->insertItem( tr ( "Canada" ) ); 271 cmbCountry->insertItem( tr ( "Canada" ) );
272 cmbCountry->insertItem( tr ( "Cape Verde" ) ); 272 cmbCountry->insertItem( tr ( "Cape Verde" ) );
273 cmbCountry->insertItem( tr ( "Cayman Islands" ) ); 273 cmbCountry->insertItem( tr ( "Cayman Islands" ) );
@@ -308,16 +308,16 @@ void ContactEditor::init() {
308 cmbCountry->insertItem( tr ( "Gambia" ) ); 308 cmbCountry->insertItem( tr ( "Gambia" ) );
309 cmbCountry->insertItem( tr ( "Georgia" ) ); 309 cmbCountry->insertItem( tr ( "Georgia" ) );
310 cmbCountry->insertItem( tr ( "Germany" ) ); 310 cmbCountry->insertItem( tr ( "Germany" ) );
311 cmbCountry->insertItem( tr ( "Gahna" ) ); 311 cmbCountry->insertItem( tr ( "Ghana" ) );
312 cmbCountry->insertItem( tr ( "Gibraltar" ) ); 312 cmbCountry->insertItem( tr ( "Gibraltar" ) );
313 cmbCountry->insertItem( tr ( "Greece" ) ); 313 cmbCountry->insertItem( tr ( "Greece" ) );
314 cmbCountry->insertItem( tr ( "Greenland" ) ); 314 cmbCountry->insertItem( tr ( "Greenland" ) );
315 cmbCountry->insertItem( tr ( "Grenada" ) ); 315 cmbCountry->insertItem( tr ( "Grenada" ) );
316 cmbCountry->insertItem( tr ( "Guadelupe" ) ); 316 cmbCountry->insertItem( tr ( "Guadeloupe" ) );
317 cmbCountry->insertItem( tr ( "Guam" ) ); 317 cmbCountry->insertItem( tr ( "Guam" ) );
318 cmbCountry->insertItem( tr ( "Guatemala" ) ); 318 cmbCountry->insertItem( tr ( "Guatemala" ) );
319 cmbCountry->insertItem( tr ( "Guinea" ) ); 319 cmbCountry->insertItem( tr ( "Guinea" ) );
320 cmbCountry->insertItem( tr ( "Guinea-bissau" ) ); 320 cmbCountry->insertItem( tr ( "Guinea-Bissau" ) );
321 cmbCountry->insertItem( tr ( "Guyana" ) ); 321 cmbCountry->insertItem( tr ( "Guyana" ) );
322 cmbCountry->insertItem( tr ( "Haiti" ) ); 322 cmbCountry->insertItem( tr ( "Haiti" ) );
323 cmbCountry->insertItem( tr ( "Holy See" ) ); 323 cmbCountry->insertItem( tr ( "Holy See" ) );
@@ -330,15 +330,15 @@ void ContactEditor::init() {
330 cmbCountry->insertItem( tr ( "Ireland" ) ); 330 cmbCountry->insertItem( tr ( "Ireland" ) );
331 cmbCountry->insertItem( tr ( "Israel" ) ); 331 cmbCountry->insertItem( tr ( "Israel" ) );
332 cmbCountry->insertItem( tr ( "Italy" ) ); 332 cmbCountry->insertItem( tr ( "Italy" ) );
333 cmbCountry->insertItem( tr ( "Jamacia" ) ); 333 cmbCountry->insertItem( tr ( "Jamaica" ) );
334 cmbCountry->insertItem( tr ( "Japan" ) ); 334 cmbCountry->insertItem( tr ( "Japan" ) );
335 cmbCountry->insertItem( tr ( "Jordan" ) ); 335 cmbCountry->insertItem( tr ( "Jordan" ) );
336 cmbCountry->insertItem( tr ( "Kazakhstan" ) ); 336 cmbCountry->insertItem( tr ( "Kazakhstan" ) );
337 cmbCountry->insertItem( tr ( "Kenya" ) ); 337 cmbCountry->insertItem( tr ( "Kenya" ) );
338 cmbCountry->insertItem( tr ( "Kribati" ) ); 338 cmbCountry->insertItem( tr ( "Kiribati" ) );
339 cmbCountry->insertItem( tr ( "Korea" ) ); 339 cmbCountry->insertItem( tr ( "Korea" ) );
340 cmbCountry->insertItem( tr ( "Kuwait" ) ); 340 cmbCountry->insertItem( tr ( "Kuwait" ) );
341 cmbCountry->insertItem( tr ( "Kyrgystan" ) ); 341 cmbCountry->insertItem( tr ( "Kyrgyzstan" ) );
342 cmbCountry->insertItem( tr ( "Laos" ) ); 342 cmbCountry->insertItem( tr ( "Laos" ) );
343 cmbCountry->insertItem( tr ( "Latvia" ) ); 343 cmbCountry->insertItem( tr ( "Latvia" ) );
344 cmbCountry->insertItem( tr ( "Lebanon" ) ); 344 cmbCountry->insertItem( tr ( "Lebanon" ) );
@@ -382,13 +382,13 @@ void ContactEditor::init() {
382 cmbCountry->insertItem( tr ( "Oman" ) ); 382 cmbCountry->insertItem( tr ( "Oman" ) );
383 cmbCountry->insertItem( tr ( "Pakistan" ) ); 383 cmbCountry->insertItem( tr ( "Pakistan" ) );
384 cmbCountry->insertItem( tr ( "Palau" ) ); 384 cmbCountry->insertItem( tr ( "Palau" ) );
385 cmbCountry->insertItem( tr ( "Palestinian Territory" ) ); 385 cmbCountry->insertItem( tr ( "Palestinian Sovereign Areas" ) );
386 cmbCountry->insertItem( tr ( "Panama" ) ); 386 cmbCountry->insertItem( tr ( "Panama" ) );
387 cmbCountry->insertItem( tr ( "Papua New Guinea" ) ); 387 cmbCountry->insertItem( tr ( "Papua New Guinea" ) );
388 cmbCountry->insertItem( tr ( "Paraguay" ) ); 388 cmbCountry->insertItem( tr ( "Paraguay" ) );
389 cmbCountry->insertItem( tr ( "Peru" ) ); 389 cmbCountry->insertItem( tr ( "Peru" ) );
390 cmbCountry->insertItem( tr ( "Philippines" ) ); 390 cmbCountry->insertItem( tr ( "Philippines" ) );
391 cmbCountry->insertItem( tr ( "Pitcairn" ) ); 391 cmbCountry->insertItem( tr ( "Pitcairn Islands" ) );
392 cmbCountry->insertItem( tr ( "Poland" ) ); 392 cmbCountry->insertItem( tr ( "Poland" ) );
393 cmbCountry->insertItem( tr ( "Portugal" ) ); 393 cmbCountry->insertItem( tr ( "Portugal" ) );
394 cmbCountry->insertItem( tr ( "Puerto Rico" ) ); 394 cmbCountry->insertItem( tr ( "Puerto Rico" ) );
@@ -435,7 +435,7 @@ void ContactEditor::init() {
435 cmbCountry->insertItem( tr ( "Uzbekistan" ) ); 435 cmbCountry->insertItem( tr ( "Uzbekistan" ) );
436 cmbCountry->insertItem( tr ( "Vanuatu" ) ); 436 cmbCountry->insertItem( tr ( "Vanuatu" ) );
437 cmbCountry->insertItem( tr ( "Venezuela" ) ); 437 cmbCountry->insertItem( tr ( "Venezuela" ) );
438 cmbCountry->insertItem( tr ( "Viet Nam" ) ); 438 cmbCountry->insertItem( tr ( "Vietnam" ) );
439 cmbCountry->insertItem( tr ( "Virgin Islands" ) ); 439 cmbCountry->insertItem( tr ( "Virgin Islands" ) );
440 cmbCountry->insertItem( tr ( "Western Sahara" ) ); 440 cmbCountry->insertItem( tr ( "Western Sahara" ) );
441 cmbCountry->insertItem( tr ( "Yemen" ) ); 441 cmbCountry->insertItem( tr ( "Yemen" ) );