From kde-commits Fri Apr 04 22:31:58 2008 From: Laurent Garnier Date: Fri, 04 Apr 2008 22:31:58 +0000 To: kde-commits Subject: KDE/kdeedu/kgeography/src Message-Id: <1207348318.796461.29762.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=120734832807803 SVN commit 793737 by lauranger: get rid of cruft from this week + update of translation source M +28 -27 mapsdatatranslation.cpp M +0 -31 placemapwidget.cpp M +0 -2 placemapwidget.h --- trunk/KDE/kdeedu/kgeography/src/mapsdatatranslation.cpp #793736:793737 @@ -89,15 +89,16 @@ i18nc("afghanistan.kgm", "Qalat"); i18nc("africa.kgm", "Africa"); i18nc("africa.kgm", "Countries"); +i18nc("africa.kgm", "Frontier"); i18nc("africa.kgm", "Water"); -i18nc("africa.kgm", "Coast"); -i18nc("africa.kgm", "Frontier"); +i18nc("africa.kgm", "Not Africa"); +i18nc("africa.kgm", "Not Africa "); i18nc("africa.kgm", "Algeria"); i18nc("africa.kgm", "Algiers"); i18nc("africa.kgm", "Angola"); i18nc("africa.kgm", "Luanda"); i18nc("africa.kgm", "Benin"); -i18nc("africa.kgm", "Porto Novo"); +i18nc("africa.kgm", "Porto-Novo"); i18nc("africa.kgm", "Botswana"); i18nc("africa.kgm", "Gaborone"); i18nc("africa.kgm", "Burkina Faso"); @@ -106,13 +107,16 @@ i18nc("africa.kgm", "Bujumbura"); i18nc("africa.kgm", "Cameroon"); i18nc("africa.kgm", "Yaoundé"); +i18nc("africa.kgm", "Cape Verde"); +i18nc("africa.kgm", "Praia"); i18nc("africa.kgm", "Central African Republic"); i18nc("africa.kgm", "Bangui"); i18nc("africa.kgm", "Chad"); i18nc("africa.kgm", "N'Djamena"); +i18nc("africa.kgm", "Comoros"); +i18nc("africa.kgm", "Moroni"); i18nc("africa.kgm", "Côte d'Ivoire"); i18nc("africa.kgm", "Yamoussoukro"); -i18nc("africa.kgm", "Cyprus"); i18nc("africa.kgm", "Democratic Republic of the Congo"); i18nc("africa.kgm", "Kinshasa"); i18nc("africa.kgm", "Djibouti"); @@ -127,22 +131,16 @@ i18nc("africa.kgm", "Addis Ababa"); i18nc("africa.kgm", "Gabon"); i18nc("africa.kgm", "Libreville"); +i18nc("africa.kgm", "Gambia"); +i18nc("africa.kgm", "Banjul"); i18nc("africa.kgm", "Ghana"); i18nc("africa.kgm", "Accra"); -i18nc("africa.kgm", "Greece"); i18nc("africa.kgm", "Guinea"); i18nc("africa.kgm", "Conakry"); i18nc("africa.kgm", "Guinea-Bissau"); i18nc("africa.kgm", "Bissau"); -i18nc("africa.kgm", "Iran"); -i18nc("africa.kgm", "Iraq"); -i18nc("africa.kgm", "Israel"); -i18nc("africa.kgm", "Italy"); -i18nc("africa.kgm", "Jordan"); i18nc("africa.kgm", "Kenya"); i18nc("africa.kgm", "Nairobi"); -i18nc("africa.kgm", "Kuwait"); -i18nc("africa.kgm", "Lebanon"); i18nc("africa.kgm", "Lesotho"); i18nc("africa.kgm", "Maseru"); i18nc("africa.kgm", "Liberia"); @@ -157,6 +155,8 @@ i18nc("africa.kgm", "Bamako"); i18nc("africa.kgm", "Mauritania"); i18nc("africa.kgm", "Nouakchott"); +i18nc("africa.kgm", "Mauritius"); +i18nc("africa.kgm", "Port Louis"); i18nc("africa.kgm", "Morocco"); i18nc("africa.kgm", "Rabat"); i18nc("africa.kgm", "Mozambique"); @@ -167,48 +167,48 @@ i18nc("africa.kgm", "Niamey"); i18nc("africa.kgm", "Nigeria"); i18nc("africa.kgm", "Abuja"); -i18nc("africa.kgm", "Portugal"); -i18nc("africa.kgm", "Qatar"); i18nc("africa.kgm", "Republic of the Congo"); i18nc("africa.kgm", "Brazzaville"); i18nc("africa.kgm", "Rwanda"); i18nc("africa.kgm", "Kigali"); -i18nc("africa.kgm", "Saudi Arabia"); i18nc("africa.kgm", "Senegal"); i18nc("africa.kgm", "Dakar"); +i18nc("africa.kgm", "Seychelles"); +i18nc("africa.kgm", "Victoria"); i18nc("africa.kgm", "Sierra Leone"); i18nc("africa.kgm", "Freetown"); i18nc("africa.kgm", "Somalia"); i18nc("africa.kgm", "Mogadishu"); -i18nc("africa.kgm", "South Africa"); -i18nc("africa.kgm", "Pretoria, Bloemfontein and Cape Town"); -i18nc("africa.kgm", "Spain"); +i18nc("africa.kgm", "Réunion "); +i18nc("africa.kgm", "Saint Denis"); i18nc("africa.kgm", "Sudan"); i18nc("africa.kgm", "Khartoum"); i18nc("africa.kgm", "Swaziland"); i18nc("africa.kgm", "Mbabane"); -i18nc("africa.kgm", "Syria"); +i18nc("africa.kgm", "São Tomé and Príncipe"); +i18nc("africa.kgm", "São Tomé"); i18nc("africa.kgm", "Tanzania"); i18nc("africa.kgm", "Dodoma"); -i18nc("africa.kgm", "The Gambia"); -i18nc("africa.kgm", "Banjul"); i18nc("africa.kgm", "Togo"); i18nc("africa.kgm", "Lomé"); i18nc("africa.kgm", "Tunisia"); i18nc("africa.kgm", "Tunis"); -i18nc("africa.kgm", "Turkey"); -i18nc("africa.kgm", "Turkmenistan"); i18nc("africa.kgm", "Uganda"); i18nc("africa.kgm", "Kampala"); -i18nc("africa.kgm", "United Arab Emirates"); -i18nc("africa.kgm", "West Bank"); i18nc("africa.kgm", "Western Sahara"); -i18nc("africa.kgm", "Laayoune"); -i18nc("africa.kgm", "Yemen"); +i18nc("africa.kgm", "El Aaiún"); i18nc("africa.kgm", "Zambia"); i18nc("africa.kgm", "Lusaka"); i18nc("africa.kgm", "Zimbabwe"); i18nc("africa.kgm", "Harare"); +i18nc("africa.kgm", "Canary Islands (Spain)"); +i18nc("africa.kgm", "Las Palmas"); +i18nc("africa.kgm", "Madeira (Portugal)"); +i18nc("africa.kgm", "Funchal"); +i18nc("africa.kgm", "Réunion (France)"); +i18nc("africa.kgm", "Saint Denis"); +i18nc("africa.kgm", "Saint Helena (UK)"); +i18nc("africa.kgm", "Jamestown"); i18nc("albania_districts.kgm", "Albania (Districts)"); i18nc("albania_districts.kgm", "Districts"); i18nc("albania_districts.kgm", "Frontier"); @@ -6201,6 +6201,7 @@ i18nc("world.kgm", "World"); i18nc("world.kgm", "Countries"); i18nc("world.kgm", "Not a Nation"); +i18nc("world.kgm", "Frontier"); i18nc("world.kgm", "Algeria"); i18nc("world.kgm", "Algiers"); i18nc("world.kgm", "Angola"); --- trunk/KDE/kdeedu/kgeography/src/placemapwidget.cpp #793736:793737 @@ -56,37 +56,6 @@ QMetaObject::invokeMethod(this, "setAutomaticZoom", Qt::QueuedConnection, Q_ARG(bool, p_automaticZoom)); } -bool placeMapWidget::isPixelInnerBorder(int x, int y, const QImage *srcImg, - const QList &ignoredColors, QRgb pixColor) -{ - int deltaX[] = {-1, 0, 1, 1, 1, 0, -1, -1}; - int deltaY[] = {-1, -1, -1, 0, 1, 1, 1, 0}; - int width = p_mapImage->width(); - int height = p_mapImage->height(); - - bool outerFound = false; - bool divisionColorFound = false; - for ( int neighbourIdx = 0 ; - neighbourIdx < 8 && ! ( outerFound && divisionColorFound ) ; - neighbourIdx ++ ) - { - int ox = x + deltaX[neighbourIdx]; - int oy = y + deltaY[neighbourIdx]; - if ( ox >= 0 && oy >= 0 && ox < width && oy < height ) - { - QRgb oPixColor = srcImg->pixel(ox, oy); - if (oPixColor != pixColor) - { - if ( ignoredColors.contains(oPixColor) ) - outerFound = true; - else - divisionColorFound = true; - } - } - } - return ! outerFound && divisionColorFound; -} - void placeMapWidget::createGameMapImage() { QVector indexesToCopy; --- trunk/KDE/kdeedu/kgeography/src/placemapwidget.h #793736:793737 @@ -51,8 +51,6 @@ void mouseReleaseEvent(QMouseEvent *e); void resizeEvent(QResizeEvent *e); void drawBackground(QPainter *painter, const QRectF &rect); - bool isPixelInnerBorder(int x, int y, const QImage *srcImg, - const QList &ignoredColors, QRgb pixColor); void createGameMapImage(); void updateCursor();