Hi,
when I update a package koffice-i18n I realized that it is necessary to carry out rebranding Krita => Chalk. Please, can make it done someone who has more experience in this?
Many thanks Slavek --
when I update a package koffice-i18n I realized that it is necessary to carry out rebranding Krita => Chalk. Please, can make it done someone who has more experience in this?
I copied the GIT files to a working directory. I tried the following:
find koffice-i18n -name krita -exec sh -c 'mv {} `dirname {}`/chalk' ;
find koffice-i18n -name krita.po -exec sh -c 'mv {} `dirname {}`/chalk.po' ;
find koffice-i18n -type f -exec sed -i 's|Krita|Chalk|g' {} ;
find koffice-i18n -type f -exec sed -i 's|krita|chalk|g' {} ;
Whether performed against a separate directory to create a large patch or performed directly in a local GIT repository, next would be a bunch of 'git add' commands to add the newly renamed chalk files and directories. Possibly like this:
for i in `find koffice-i18n -name chalk*`; git add $i; done
Darrell
<snip>
Whether performed against a separate directory to create a large patch or performed directly in a local GIT repository, next would be a bunch of 'git add' commands to add the newly renamed chalk files and directories. Possibly like this:
for i in `find koffice-i18n -name chalk*`; git add $i; done
Usually you can just do a "git add *" from the top directory, and GIT will automatically detect deleted, added, and renamed files when you "git commit -a" afterwards.
Tim
On Saturday 15 of September 2012 00:19:15 Timothy Pearson wrote:
<snip>
Whether performed against a separate directory to create a large patch or performed directly in a local GIT repository, next would be a bunch of 'git add' commands to add the newly renamed chalk files and directories. Possibly like this:
for i in `find koffice-i18n -name chalk*`; git add $i; done
Usually you can just do a "git add *" from the top directory, and GIT will automatically detect deleted, added, and renamed files when you "git commit -a" afterwards.
Tim
I'm using with success always: git add --all
Slavek --
On Saturday 15 of September 2012 00:17:04 Darrell Anderson wrote:
when I update a package koffice-i18n I realized that it is necessary to carry out rebranding Krita => Chalk. Please, can make it done someone who has more experience in this?
I copied the GIT files to a working directory. I tried the following:
find koffice-i18n -name krita -exec sh -c 'mv {} `dirname {}`/chalk' ;
find koffice-i18n -name krita.po -exec sh -c 'mv {} `dirname {}`/chalk.po' ;
find koffice-i18n -type f -exec sed -i 's|Krita|Chalk|g' {} ;
find koffice-i18n -type f -exec sed -i 's|krita|chalk|g' {} ;
Whether performed against a separate directory to create a large patch or performed directly in a local GIT repository, next would be a bunch of 'git add' commands to add the newly renamed chalk files and directories. Possibly like this:
for i in `find koffice-i18n -name chalk*`; git add $i; done
Darrell
I tried sed's that you said, but it causes docboook breakage:
/opt/trinity/bin/meinproc --check --cache index.cache.bz2 ./index.docbook index.docbook:37: parser error : Entity 'chalk' not defined
El manual del &chalk;</title>
^ index.docbook:124: parser error : Entity 'chalk' not defined
El &chalk; és part del paquet &koffice;. El &chalk; és una aplicació per al
^ index.docbook:124: parser error : Entity 'chalk' not defined
El &chalk; és part del paquet &koffice;. El &chalk; és una aplicació per al
^
When I revert "&chalk;" back to "&krita;", so the problem is resolved. But I do not know how it is to be right?
Slavek --
On Sunday 16 of September 2012 03:40:34 Slávek Banko wrote:
On Saturday 15 of September 2012 00:17:04 Darrell Anderson wrote:
when I update a package koffice-i18n I realized that it is necessary to carry out rebranding Krita => Chalk. Please, can make it done someone who has more experience in this?
I copied the GIT files to a working directory. I tried the following:
find koffice-i18n -name krita -exec sh -c 'mv {} `dirname {}`/chalk' ;
find koffice-i18n -name krita.po -exec sh -c 'mv {} `dirname {}`/chalk.po' ;
find koffice-i18n -type f -exec sed -i 's|Krita|Chalk|g' {} ;
find koffice-i18n -type f -exec sed -i 's|krita|chalk|g' {} ;
Whether performed against a separate directory to create a large patch or performed directly in a local GIT repository, next would be a bunch of 'git add' commands to add the newly renamed chalk files and directories. Possibly like this:
for i in `find koffice-i18n -name chalk*`; git add $i; done
Darrell
I tried sed's that you said, but it causes docboook breakage:
/opt/trinity/bin/meinproc --check --cache index.cache.bz2 ./index.docbook index.docbook:37: parser error : Entity 'chalk' not defined
El manual del &chalk;</title>
^index.docbook:124: parser error : Entity 'chalk' not defined
El &chalk; és part del paquet &koffice;. El &chalk; és una aplicació per al
^index.docbook:124: parser error : Entity 'chalk' not defined
El &chalk; és part del paquet &koffice;. El &chalk; és una aplicació per al
^When I revert "&chalk;" back to "&krita;", so the problem is resolved. But I do not know how it is to be right?
Slavek
I found it! tde/main/tdelibs/kdoctools/customization/entities/general.entities tde/main/tdelibs/kdoctools/customization/obsolete/general.entities
However, the change needs to be also in a few more files (also in kde-i18n): tde/main/tdebase/doc/userguide/migrator-applications.docbook tde/main/tdebase/doc/userguide/kde-office.docbook
A useful may be also a change in other files: tde/main/tdelibs/kdecore/kdebug.areas tde/main/tdelibs/kdeui/kdepackages.h tde/main/tdeaccessibility/IconThemes/mono/scalable/apps/krita.svgz
If there are no objections, I'll fix everything gradually. In any case, I am still concerned that "krita" may be in some languages part of words.
Slavek --
I found it! tde/main/tdelibs/kdoctools/customization/entities/general.entities tde/main/tdelibs/kdoctools/customization/obsolete/general.entities
Looks like you posted about the same time I was writing my response. :) Yes, that is the main file to edit.
However, the change needs to be also in a few more files (also in kde-i18n): tde/main/tdebase/doc/userguide/migrator-applications.docbook tde/main/tdebase/doc/userguide/kde-office.docbook
I have not built any of the localization packages in a while. Next time I build a full package set I'll do that.
A useful may be also a change in other files: tde/main/tdelibs/kdecore/kdebug.areas tde/main/tdelibs/kdeui/kdepackages.h tde/main/tdeaccessibility/IconThemes/mono/scalable/apps/krita.svgz
We need to rename all krita png/svg(z) files and update for branding. I checked the respective *.desktop files and all use Icon=chalkg, so they all are okay.
I will post a request for branding help with the image files.
If there are no objections, I'll fix everything gradually.
No objections from me.
In any case, I am still concerned that "krita" may be in some languages part of words.
Yes, that always has been a concern of mine when trying to update localization files. The only solution seems to be to do our best guess and then wait for somebody who uses that language to notice mistakes. :(
Darrell
On Sunday 16 of September 2012 04:59:41 Darrell Anderson wrote:
Yes, that always has been a concern of mine when trying to update
localization files. The only solution seems to be to do our best guess and then wait for somebody who uses that language to notice mistakes. :(
Darrell
I tried to prepare several 'sed' replacements to find 'krita' as a part of the normal word. And I found only a single occurrence. So I hope I did not break too much :)
It seems that I am ready to push to GIT rebranded version koffice-i18n. Thank you for your support.
Slavek --
I tried to prepare several 'sed' replacements to find 'krita' as a part of the normal word. And I found only a single occurrence. So I hope I did not break too much :)
It seems that I am ready to push to GIT rebranded version koffice-i18n. Thank you for your support.
Something bothers me. The koffice chalk docbooks compile without error. I haven't figured out how that happens with no &chalk; entity being defined, yet koffice-i18n docbook files fail to compile.
Possibly wait a bit until we figure out this anomaly?
Darrell
Something bothers me. The koffice chalk docbooks compile without error. I haven't figured out how that happens with no &chalk; entity being defined, yet koffice-i18n docbook files fail to compile.
Possibly wait a bit until we figure out this anomaly?
Okay, I see what happened. When krita was renamed to chalk the 'ENTITY chalk' declaration was added individually to each affected koffice docbook file rather than once to the master general.entities file.
We still need the definition in general.entities so go ahead and push that patch. :)
Darrell
On Sunday 16 of September 2012 20:26:19 Darrell Anderson wrote:
I tried to prepare several 'sed' replacements to find 'krita' as a part of the normal word. And I found only a single
occurrence. So I
hope I did not break too much :)
It seems that I am ready to push to GIT rebranded version koffice-i18n. Thank you for your support.
Something bothers me. The koffice chalk docbooks compile without error.
I haven't figured out how that happens with no &chalk; entity being defined, yet koffice-i18n docbook files fail to compile.
Possibly wait a bit until we figure out this anomaly?
Darrell
I updated tdelibs (added chalk to general.entries) and since then for me docbook pages with &chalk; working properly. If you have pulled tdelibs you already have &chalk; well defined.
Slavek --
I tried sed's that you said, but it causes docboook breakage:
In your build environment, try adding the following to $TDEDIR/share/apps/ksgmltools2/customization/entities/general.entities:
<!ENTITY chalk "<application>Chalk</application>">
Then try building koffice-i18n.
I'm guessing that will succeed. We then probably should push the following patch to tdelibs:
diff -urN tdelibs/kdoctools/customization/entities/general.entities tdelibs.new/kdoctools/customization/entities/general.entities --- tdelibs/kdoctools/customization/entities/general.entities 2012-09-14 18:00:12.000000000 -0500 +++ tdelibs.new/kdoctools/customization/entities/general.entities 2012-09-15 21:24:02.000000000 -0500 @@ -294,6 +294,7 @@ <!ENTITY kreversi "<application>KReversi</application>"> <!ENTITY krfb "<application>Desktop Sharing</application>"> <!ENTITY krita "<application>Krita</application>"> +<!ENTITY chalk "<application>Chalk</application>"> <!ENTITY kruler "<application>TDE Screen Ruler</application>"> <!ENTITY ksame "<application>KSame</application>"> <!ENTITY kscd "<application>KsCD</application>">
Darrell
On Sunday 16 of September 2012 04:33:45 Darrell Anderson wrote:
I tried sed's that you said, but it causes docboook breakage:
In your build environment, try adding the following to $TDEDIR/share/apps/ksgmltools2/customization/entities/general.entities:
<!ENTITY chalk "<application>Chalk</application>">
Then try building koffice-i18n.
I'm guessing that will succeed. We then probably should push the following patch to tdelibs:
diff -urN tdelibs/kdoctools/customization/entities/general.entities tdelibs.new/kdoctools/customization/entities/general.entities --- tdelibs/kdoctools/customization/entities/general.entities 2012-09-14 18:00:12.000000000 -0500 +++ tdelibs.new/kdoctools/customization/entities/general.entities 2012-09-15 21:24:02.000000000 -0500 @@ -294,6 +294,7 @@
<!ENTITY kreversi "<application>KReversi</application>">
<!ENTITY krfb "<application>Desktop Sharing</application>">
<!ENTITY krita "<application>Krita</application>">
+<!ENTITY chalk "<application>Chalk</application>">
<!ENTITY kruler "<application>TDE Screen Ruler</application>">
<!ENTITY ksame "<application>KSame</application>">
<!ENTITY kscd "<application>KsCD</application>">
Darrell
You propose to add this one line, the original line with Krita leave unchanged and as well as other files that I mentioned in the second mail, leave unchanged?
Slavek --
You propose to add this one line, the original line with Krita leave unchanged and as well as other files that I mentioned in the second mail, leave unchanged?
Yes, let's leave the original krita entity. That way when we (if ever) edit the docbook files and discuss the renaming, we still have a docbook entity for krita.
Darrell
-
Darrell Anderson -
Slávek Banko -
Timothy Pearson