Hi all,
> Ok thanks. But why you haven't make a patch against svn repository (dtable > and trunk branch) ? I didn't submit a patch because I haven't got the latest source from svn (I haven't yet tried to access the repository), and I don't know what the dtable and the trunk branches are. I could have submitted a diff (is that what you mean by patch?) but because of the number of identical replacements, the diff file was far too large. And it's much easier to see what the changes are from the sed script, rather than the diff. It's probably no harder to apply either, right? > The diff needs to be reviewed by Malcolm Hunter before committed. Good idea, although I must repeat that there are no changes made to the en_GB file which aren't made to all the others too. I didn't make any GB-specific changes. There are two reasons why I think this is important - firstly for all english speakers it gives a much better image to digikam if the errors are fixed. Secondly, it should make it easier for the translators too, because if the english version makes sense it's a lot easier to translate. Cheers, and thanks for the hard work, everyone! __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Op zaterdag 18 februari 2006 14:50, schreef linux newbie:
> Hi all, > > > Ok thanks. But why you haven't make a patch against > > svn repository (dtable > > > and trunk branch) ? > > I didn't submit a patch because I haven't got the > latest source from svn (I haven't yet tried to access > the repository), and I don't know what the dtable and > the trunk branches are. I could have submitted a diff > (is that what you mean by patch?) but because of the > number of identical replacements, the diff file was > far too large. And it's much easier to see what the > changes are from the sed script, rather than the diff. > It's probably no harder to apply either, right? No. diff is much easier (please provide a diff -u) > > The diff needs to be reviewed by Malcolm Hunter > > before committed. > > Good idea, although I must repeat that there are no > changes made to the en_GB file which aren't made to > all the others too. I didn't make any GB-specific > changes. Malcolm Hunter is a general proofreader en_US (_and_ translator en_GB). > There are two reasons why I think this is important - > firstly for all english speakers it gives a much > better image to digikam if the errors are fixed. full ack. > Secondly, it should make it easier for the translators > too, because if the english version makes sense it's a > lot easier to translate. These are typo's.... But we all agree errors should be fixed. Tom _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel attachment0 (196 bytes) Download Attachment |
> No, in a diff/patch there is context, in your sed
> script not. True. I followed the svn instructions at http://www.digikam.org/?q=download/svn and got digikam, digikamimageplugins, kde-common/admin and extragear/libs. After 30M of download, I didn't get any .po files!! That means if I provide a diff, the po files won't be altered - presumably this would give problems as it wouldn't be able to find the entries in the po files??? I checked the cpp files and note that MHunter has already spotted and corrected some of the mistakes last week! That will teach me a lesson! But there are still some revealed by the sed script, and I attach a diff -ur output below. Hope this helps! Note that without the po files (and with some fixes already made) this diff output is a lot more manageable in size - earlier this text file was almost 400K, which was why I wanted to send a script instead! ------ diff -ur latest/graphics/digikam/digikam/imagepropertieshistogram.cpp latmod/graphics/digikam/digikam/imagepropertieshistogram.cpp --- latest/graphics/digikam/digikam/imagepropertieshistogram.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/digikam/imagepropertieshistogram.cpp 2006-02-18 18:36:14.000000000 +0100 @@ -81,7 +81,7 @@ "<b>Green</b>: drawing the green image channel values.<p>" "<b>Blue</b>: drawing the blue image channel values.<p>" "<b>Alpha</b>: drawing the alpha image channel values. " - "This channel corresponding to the transparency value and " + "This channel corresponds to the transparency value and " "is supported by some image formats such as PNG or GIF.<p>" "<b>Colors</b>: drawing all color channels values at the same time.")); diff -ur latest/graphics/digikam/imageplugins/imageeffect_autocorrection.cpp latmod/graphics/digikam/imageplugins/imageeffect_autocorrection.cpp --- latest/graphics/digikam/imageplugins/imageeffect_autocorrection.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/imageplugins/imageeffect_autocorrection.cpp 2006-02-18 18:36:13.000000000 +0100 @@ -78,8 +78,8 @@ m_typeCB->setCurrentText( i18n("Auto Levels") ); QWhatsThis::add( m_typeCB, i18n("<p>Select here the auto-color correction tool to use:<p>" "<b>Auto Levels</b>: This option maximizes the tonal range in the Red, " - "Green, and Blue channels. It search the image shadow and highlight " - "limit values and adjust the Red, Green, and Blue channels " + "Green, and Blue channels. It searches the image shadow and highlight " + "limit values and adjusts the Red, Green, and Blue channels " "to a full histogram range.<p>" "<b>Normalize</b>: this option scales brightness values across the active " "image so that the darkest point becomes black, and the " diff -ur latest/graphics/digikam/imageplugins/imageeffect_bwsepia.cpp latmod/graphics/digikam/imageplugins/imageeffect_bwsepia.cpp --- latest/graphics/digikam/imageplugins/imageeffect_bwsepia.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/imageplugins/imageeffect_bwsepia.cpp 2006-02-18 18:36:13.000000000 +0100 @@ -63,7 +63,7 @@ frame->setFrameStyle(QFrame::Panel|QFrame::Sunken); QVBoxLayout* l = new QVBoxLayout(frame, 5, 0); m_previewWidget = new Digikam::ImageWidget(480, 320, frame); - QWhatsThis::add( m_previewWidget, i18n("<p>This is the black and White conversion tool preview")); + QWhatsThis::add( m_previewWidget, i18n("<p>This is the black and white conversion tool preview")); l->addWidget(m_previewWidget, 0); topLayout->addWidget(frame); @@ -86,10 +86,10 @@ QWhatsThis::add( m_typeCB, i18n("<p>Select here the black and white conversion type:<p>" "<b>Neutral</b>: simulate black and white neutral film exposure.<p>" "<b>Green Filter</b>: simulate black and white film exposure using green filter. " - "This provides an universal asset for all scenics, especially suited for portraits " + "This provides a universal asset for all scenics, especially suited for portraits " "photographed against sky.<p>" "<b>Orange Filter</b>: simulate black and white film exposure using orange filter. " - "This will enhances landscapes, marine scenes and aerial photography.<p>" + "This will enhance landscapes, marine scenes and aerial photography.<p>" "<b>Red Filter</b>: simulate black and white film exposure using red filter. " "Using this one creates dramatic sky effects and simulates moonlight scenes in daytime.<p>" "<b>Yellow Filter</b>: simulate black and white film exposure using yellow filter. " @@ -100,9 +100,9 @@ "<b>Brown Tone</b>: more neutral than Sepia Tone filter.<p>" "<b>Cold Tone</b>: start subtle and replicate printing on a cold tone black and white " "paper such as a bromide enlarging paper.<p>" - "<b>Selenium Tone</b>: effect that replicate traditional selenium chemical toning done " + "<b>Selenium Tone</b>: effect that replicates traditional selenium chemical toning done " "in the darkroom.<p>" - "<b>Platinum Tone</b>: effect that replicate traditional platinum chemical toning done " + "<b>Platinum Tone</b>: effect that replicates traditional platinum chemical toning done " "in the darkroom." )); diff -ur latest/graphics/digikam/imageplugins/imageeffect_ratiocrop.cpp latmod/graphics/digikam/imageplugins/imageeffect_ratiocrop.cpp --- latest/graphics/digikam/imageplugins/imageeffect_ratiocrop.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/imageplugins/imageeffect_ratiocrop.cpp 2006-02-18 18:36:13.000000000 +0100 @@ -99,7 +99,7 @@ m_ratioCB->insertItem( i18n("None") ); m_ratioCB->setCurrentText( "1:1" ); QWhatsThis::add( m_ratioCB, i18n("<p>Select here your constrained aspect ratio for cropping. " - "The Golden Ratio 1:1.618. A composition following this rule " + "The Golden Ratio is 1:1.618. A composition following this rule " "is considered visually harmonious")); m_orientLabel = new QLabel(i18n("Orientation:"), cropSelection); diff -ur latest/graphics/digikam/kioslave/digikamsearch.cpp latmod/graphics/digikam/kioslave/digikamsearch.cpp --- latest/graphics/digikam/kioslave/digikamsearch.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/kioslave/digikamsearch.cpp 2006-02-18 18:36:15.000000000 +0100 @@ -617,7 +617,7 @@ // ok. its an int, does it look like a year? if (1970 <= num && num <= QDate::currentDate().year()) { - // very sure its a year + // very sure it's a year return QString("%1-%-%").arg(num); } } diff -ur latest/graphics/digikam/showfoto/imagepropertieshistogram.cpp latmod/graphics/digikam/showfoto/imagepropertieshistogram.cpp --- latest/graphics/digikam/showfoto/imagepropertieshistogram.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/showfoto/imagepropertieshistogram.cpp 2006-02-18 18:36:14.000000000 +0100 @@ -81,7 +81,7 @@ "<b>Green</b>: drawing the green image channel values.<p>" "<b>Blue</b>: drawing the blue image channel values.<p>" "<b>Alpha</b>: drawing the alpha image channel values. " - "This channel corresponding to the transparency value and " + "This channel corresponds to the transparency value and " "is supported by some image formats such as PNG or GIF.<p>" "<b>Colors</b>: drawing all color channels values at the same time.")); diff -ur latest/graphics/digikam/showfoto/setupslideshow.cpp latmod/graphics/digikam/showfoto/setupslideshow.cpp --- latest/graphics/digikam/showfoto/setupslideshow.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/showfoto/setupslideshow.cpp 2006-02-18 18:36:14.000000000 +0100 @@ -56,7 +56,7 @@ QWhatsThis::add( m_loopMode, i18n("<p>Slideshow running in loop with all current images.")); m_fullScreenMode = new QCheckBox(i18n("Fullscreen mode"), parent); - QWhatsThis::add( m_fullScreenMode, i18n("<p>Toogle in fullScreen mode during Slideshow.")); + QWhatsThis::add( m_fullScreenMode, i18n("<p>Toggle in fullScreen mode during Slideshow.")); layout->addWidget( m_delayInput ); layout->addWidget( m_startWithCurrent ); diff -ur latest/graphics/digikam/utilities/cameragui/cameraui.cpp latmod/graphics/digikam/utilities/cameragui/cameraui.cpp --- latest/graphics/digikam/utilities/cameragui/cameraui.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/utilities/cameragui/cameraui.cpp 2006-02-18 18:36:15.000000000 +0100 @@ -336,7 +336,7 @@ { if (KMessageBox::warningYesNo(this, i18n("Failed to connect to camera. " - "Please make sure its connected " + "Please make sure it's connected " "properly and turned on. " "Would you like to try again?"), i18n("Connection Failed"), __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Op zaterdag 18 februari 2006 18:48, schreef linux newbie:
> > No, in a diff/patch there is context, in your sed > > script not. > > That means if I provide a diff, the po files won't be > altered - presumably this would give problems as it > wouldn't be able to find the entries in the po > files??? The changes will be automatically distributed to all the po-files. > But there > are still some revealed by the sed script, and I > attach a diff -ur output below. Hope this helps! Can you send it again, but not by pasting it in the email, but attaching it. thnxs. Toma _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel attachment0 (196 bytes) Download Attachment |
OK!
Is there more information somewhere on how the whole internationalisation works, with the po files? --- Tom Albers <[hidden email]> wrote: > Can you send it again, but not by pasting it in the > email, but attaching it. __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com diff -ur latest/graphics/digikam/digikam/imagepropertieshistogram.cpp latmod/graphics/digikam/digikam/imagepropertieshistogram.cpp --- latest/graphics/digikam/digikam/imagepropertieshistogram.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/digikam/imagepropertieshistogram.cpp 2006-02-18 18:36:14.000000000 +0100 @@ -81,7 +81,7 @@ "<b>Green</b>: drawing the green image channel values.<p>" "<b>Blue</b>: drawing the blue image channel values.<p>" "<b>Alpha</b>: drawing the alpha image channel values. " - "This channel corresponding to the transparency value and " + "This channel corresponds to the transparency value and " "is supported by some image formats such as PNG or GIF.<p>" "<b>Colors</b>: drawing all color channels values at the same time.")); diff -ur latest/graphics/digikam/imageplugins/imageeffect_autocorrection.cpp latmod/graphics/digikam/imageplugins/imageeffect_autocorrection.cpp --- latest/graphics/digikam/imageplugins/imageeffect_autocorrection.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/imageplugins/imageeffect_autocorrection.cpp 2006-02-18 18:36:13.000000000 +0100 @@ -78,8 +78,8 @@ m_typeCB->setCurrentText( i18n("Auto Levels") ); QWhatsThis::add( m_typeCB, i18n("<p>Select here the auto-color correction tool to use:<p>" "<b>Auto Levels</b>: This option maximizes the tonal range in the Red, " - "Green, and Blue channels. It search the image shadow and highlight " - "limit values and adjust the Red, Green, and Blue channels " + "Green, and Blue channels. It searches the image shadow and highlight " + "limit values and adjusts the Red, Green, and Blue channels " "to a full histogram range.<p>" "<b>Normalize</b>: this option scales brightness values across the active " "image so that the darkest point becomes black, and the " diff -ur latest/graphics/digikam/imageplugins/imageeffect_bwsepia.cpp latmod/graphics/digikam/imageplugins/imageeffect_bwsepia.cpp --- latest/graphics/digikam/imageplugins/imageeffect_bwsepia.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/imageplugins/imageeffect_bwsepia.cpp 2006-02-18 18:36:13.000000000 +0100 @@ -63,7 +63,7 @@ frame->setFrameStyle(QFrame::Panel|QFrame::Sunken); QVBoxLayout* l = new QVBoxLayout(frame, 5, 0); m_previewWidget = new Digikam::ImageWidget(480, 320, frame); - QWhatsThis::add( m_previewWidget, i18n("<p>This is the black and White conversion tool preview")); + QWhatsThis::add( m_previewWidget, i18n("<p>This is the black and white conversion tool preview")); l->addWidget(m_previewWidget, 0); topLayout->addWidget(frame); @@ -86,10 +86,10 @@ QWhatsThis::add( m_typeCB, i18n("<p>Select here the black and white conversion type:<p>" "<b>Neutral</b>: simulate black and white neutral film exposure.<p>" "<b>Green Filter</b>: simulate black and white film exposure using green filter. " - "This provides an universal asset for all scenics, especially suited for portraits " + "This provides a universal asset for all scenics, especially suited for portraits " "photographed against sky.<p>" "<b>Orange Filter</b>: simulate black and white film exposure using orange filter. " - "This will enhances landscapes, marine scenes and aerial photography.<p>" + "This will enhance landscapes, marine scenes and aerial photography.<p>" "<b>Red Filter</b>: simulate black and white film exposure using red filter. " "Using this one creates dramatic sky effects and simulates moonlight scenes in daytime.<p>" "<b>Yellow Filter</b>: simulate black and white film exposure using yellow filter. " @@ -100,9 +100,9 @@ "<b>Brown Tone</b>: more neutral than Sepia Tone filter.<p>" "<b>Cold Tone</b>: start subtle and replicate printing on a cold tone black and white " "paper such as a bromide enlarging paper.<p>" - "<b>Selenium Tone</b>: effect that replicate traditional selenium chemical toning done " + "<b>Selenium Tone</b>: effect that replicates traditional selenium chemical toning done " "in the darkroom.<p>" - "<b>Platinum Tone</b>: effect that replicate traditional platinum chemical toning done " + "<b>Platinum Tone</b>: effect that replicates traditional platinum chemical toning done " "in the darkroom." )); diff -ur latest/graphics/digikam/imageplugins/imageeffect_ratiocrop.cpp latmod/graphics/digikam/imageplugins/imageeffect_ratiocrop.cpp --- latest/graphics/digikam/imageplugins/imageeffect_ratiocrop.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/imageplugins/imageeffect_ratiocrop.cpp 2006-02-18 18:36:13.000000000 +0100 @@ -99,7 +99,7 @@ m_ratioCB->insertItem( i18n("None") ); m_ratioCB->setCurrentText( "1:1" ); QWhatsThis::add( m_ratioCB, i18n("<p>Select here your constrained aspect ratio for cropping. " - "The Golden Ratio 1:1.618. A composition following this rule " + "The Golden Ratio is 1:1.618. A composition following this rule " "is considered visually harmonious")); m_orientLabel = new QLabel(i18n("Orientation:"), cropSelection); diff -ur latest/graphics/digikam/kioslave/digikamsearch.cpp latmod/graphics/digikam/kioslave/digikamsearch.cpp --- latest/graphics/digikam/kioslave/digikamsearch.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/kioslave/digikamsearch.cpp 2006-02-18 18:36:15.000000000 +0100 @@ -617,7 +617,7 @@ // ok. its an int, does it look like a year? if (1970 <= num && num <= QDate::currentDate().year()) { - // very sure its a year + // very sure it's a year return QString("%1-%-%").arg(num); } } diff -ur latest/graphics/digikam/showfoto/imagepropertieshistogram.cpp latmod/graphics/digikam/showfoto/imagepropertieshistogram.cpp --- latest/graphics/digikam/showfoto/imagepropertieshistogram.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/showfoto/imagepropertieshistogram.cpp 2006-02-18 18:36:14.000000000 +0100 @@ -81,7 +81,7 @@ "<b>Green</b>: drawing the green image channel values.<p>" "<b>Blue</b>: drawing the blue image channel values.<p>" "<b>Alpha</b>: drawing the alpha image channel values. " - "This channel corresponding to the transparency value and " + "This channel corresponds to the transparency value and " "is supported by some image formats such as PNG or GIF.<p>" "<b>Colors</b>: drawing all color channels values at the same time.")); diff -ur latest/graphics/digikam/showfoto/setupslideshow.cpp latmod/graphics/digikam/showfoto/setupslideshow.cpp --- latest/graphics/digikam/showfoto/setupslideshow.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/showfoto/setupslideshow.cpp 2006-02-18 18:36:14.000000000 +0100 @@ -56,7 +56,7 @@ QWhatsThis::add( m_loopMode, i18n("<p>Slideshow running in loop with all current images.")); m_fullScreenMode = new QCheckBox(i18n("Fullscreen mode"), parent); - QWhatsThis::add( m_fullScreenMode, i18n("<p>Toogle in fullScreen mode during Slideshow.")); + QWhatsThis::add( m_fullScreenMode, i18n("<p>Toggle in fullScreen mode during Slideshow.")); layout->addWidget( m_delayInput ); layout->addWidget( m_startWithCurrent ); diff -ur latest/graphics/digikam/utilities/cameragui/cameraui.cpp latmod/graphics/digikam/utilities/cameragui/cameraui.cpp --- latest/graphics/digikam/utilities/cameragui/cameraui.cpp 2006-02-18 18:34:38.000000000 +0100 +++ latmod/graphics/digikam/utilities/cameragui/cameraui.cpp 2006-02-18 18:36:15.000000000 +0100 @@ -336,7 +336,7 @@ { if (KMessageBox::warningYesNo(this, i18n("Failed to connect to camera. " - "Please make sure its connected " + "Please make sure it's connected " "properly and turned on. " "Would you like to try again?"), i18n("Connection Failed"), _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
On Saturday 18 February 2006 19:23, linux newbie wrote:
> Is there more information somewhere on how the whole > internationalisation works, with the po files? You could visit the new KDE localisation website at http://l10n.kde.org -anders -- www: http://alweb.dk jabber: [hidden email] _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Free forum by Nabble | Edit this page |