[kde-doc-english] Frozen kdelibs, new entities and other Kate/KWrite troubles
El Dimarts, 22 de novembre de 2011, a les 11:11:30, Freek de Kruijf va escriure: > On dinsdag 22 november 2011 00:34:43 Albert Astals Cid wrote: > > There is no kdelibs 4.8 (it does not exist), also it does not make sense > > for you to push to 4.6 as there are no more releases of it anymore. > > I still did push the new version of .../customization/nl/user.entities to > KDE/4.6 in the hope there is a parallel path by a distributor to take that > file and put it in the distribution still using 4.6 like earlier versions of > openSUSE. I do see new versions of localization files of KDE coming into my > system, while I still use KDE 4.6. > The file .../customization/nl/user.entities is the only file in kdelibs, in > the few years I coordinate the Dutch translations, that I needed to change. > > > Let me try to explain the main difference between svn and git regarding > > branches > > > > in svn each branch had a different url, e.g. > > /trunk/KDE/kdelibs > > /branches/KDE/4.7/kdelibs > > etc > > > > in git everything has the same url, e.g. > > git://anongit.kde.org/kdelibs > > contains ALL the kdelibs branches > > > > So when you do > > git clone git://anongit.kde.org/kdelibs > > you end up with master (what was called trunk before) in a folder named > > kdelibs > > > > If you want to switch to a different branch, you just switch to it from > > within the same repository (folder), doing > > git checkout master > > git checkout KDE/4.7 > > git checkout KDE/4.6 > > etc > > So it really is a turning stage and you have to give the above command to > see the files in that version. > > > You can view all the existing branches with git branch -a > > > > Then depending which branch you have checked out > > Having this branch checked out and left it alone for some time, I use(d) > git pull --rebase > to make it current or should I use the checkout command again? You need to pull + rebase after each checkout to make sure you have all the new stuff of the branch you just switched to. > > When I need to change something first I do the above to make it current and > after that put my changes in and give the command > > git commit -a -m 'some text about the type of change' > > then I continue like below. > > > you need to push to the > > same branch (otherwise very bad things can happen), that is > > git push origin master > > git push origin KDE/4.7 > > git push origin KDE/4.6 > > > > This should give you a quick overview of how git works, but i recommend > > that you read some of the tutorials out there. If you do not have time > > for that, just send me the patches you need to commit to kdelibs. > > > > > How do these changes in kdelibs boil down to a distribution? Are > > > they > > > only part of a minor release of KDE or is there a separate work flow > > > for changes that are made in the area where localized information > > > is produced, like kdelibs, but also in the i18n svn repository. So > > > a distribution can regularly pick up these packages, apart from the > > > minor releases of KDE. > > > > Distributions use tarballs that we release with every minor release like > > they always have done. > > Like I wrote above, I do see new versions of packages coming in recently in > KDE 4.6 with localized data, like kde4-i18n-nl. > Thinking about this, it may be new localized data from KDE packages that > have their own version scheme. So can you enlighten us on this? I will ask > openSUSE as well. openSUSE might be updating from SVN, that is non standard and regular distros update from packages, that's why we make them. Albert
[kde-doc-english] Frozen kdelibs, new entities and other Kate/KWrite troubles
On dinsdag 22 november 2011 00:34:43 Albert Astals Cid wrote: > > There is no kdelibs 4.8 (it does not exist), also it does not make sense > for you to push to 4.6 as there are no more releases of it anymore. I still did push the new version of .../customization/nl/user.entities to KDE/4.6 in the hope there is a parallel path by a distributor to take that file and put it in the distribution still using 4.6 like earlier versions of openSUSE. I do see new versions of localization files of KDE coming into my system, while I still use KDE 4.6. The file .../customization/nl/user.entities is the only file in kdelibs, in the few years I coordinate the Dutch translations, that I needed to change. > Let me try to explain the main difference between svn and git regarding > branches > > in svn each branch had a different url, e.g. > /trunk/KDE/kdelibs > /branches/KDE/4.7/kdelibs > etc > > in git everything has the same url, e.g. > git://anongit.kde.org/kdelibs > contains ALL the kdelibs branches > > So when you do > git clone git://anongit.kde.org/kdelibs > you end up with master (what was called trunk before) in a folder named > kdelibs > > If you want to switch to a different branch, you just switch to it from > within the same repository (folder), doing > git checkout master > git checkout KDE/4.7 > git checkout KDE/4.6 > etc So it really is a turning stage and you have to give the above command to see the files in that version. > You can view all the existing branches with git branch -a > > Then depending which branch you have checked out Having this branch checked out and left it alone for some time, I use(d) git pull --rebase to make it current or should I use the checkout command again? When I need to change something first I do the above to make it current and after that put my changes in and give the command git commit -a -m 'some text about the type of change' then I continue like below. > you need to push to the > same branch (otherwise very bad things can happen), that is > git push origin master > git push origin KDE/4.7 > git push origin KDE/4.6 > > This should give you a quick overview of how git works, but i recommend > that you read some of the tutorials out there. If you do not have time for > that, just send me the patches you need to commit to kdelibs. > > > How do these changes in kdelibs boil down to a distribution? Are they > > only part of a minor release of KDE or is there a separate work flow for > > changes that are made in the area where localized information is > > produced, like kdelibs, but also in the i18n svn repository. So a > > distribution can regularly pick up these packages, apart from the minor > > releases of KDE. > > Distributions use tarballs that we release with every minor release like > they always have done. Like I wrote above, I do see new versions of packages coming in recently in KDE 4.6 with localized data, like kde4-i18n-nl. Thinking about this, it may be new localized data from KDE packages that have their own version scheme. So can you enlighten us on this? I will ask openSUSE as well. -- fr.gr. Freek de Kruijf
[kde-doc-english] Frozen kdelibs, new entities and other Kate/KWrite troubles
A Dilluns, 21 de novembre de 2011, Freek de Kruijf v?reu escriure: > On maandag 21 november 2011 00:07:58 Albert Astals Cid wrote: > > A Diumenge, 20 de novembre de 2011, Freek de Kruijf v?reu escriure: > > > On zondag 20 november 2011 23:21:13 Albert Astals Cid wrote: > > > > > There is no kdelibs in branch, which is 4.7, so no kdelibs > > > > > 4.7! > > > > > > > > Could not parse this sentence. > > > > > > What do you mean by that? Do you mean there is a kdelibs in git for > > > trunk, branch and 4.6. If so please tell me, a recipe, how to use > > > them, > > > or rather how to update them. > > > > I mean i did not understand what you said at all with "There is no > > kdelibs in branch, which is 4.7, so no kdelibs 4.7!". > > I am probably confused by the git concept. I have in my KDE trunk directory > a directory kdelibs in which I import the git repository. So my view on > this was that only KDE trunk was present there; currently 4.8. However > later I got the recipe to enter a command "git push origin KDE/4.7", of > which I did not really understand what it does. Thinking about that, my > perception is now that this git directory looks like a turning stage with > several different stages behind it, apparently a stage called trunk and one > called 4.7 and maybe more. So do I have to give "git push origin KDE/4.7" > to see and use 4.7? What command to see 4.8 and 4.6 and make changes in it. There is no kdelibs 4.8 (it does not exist), also it does not make sense for you to push to 4.6 as there are no more releases of it anymore. Let me try to explain the main difference between svn and git regarding branches in svn each branch had a different url, e.g. /trunk/KDE/kdelibs /branches/KDE/4.7/kdelibs etc in git everything has the same url, e.g. git://anongit.kde.org/kdelibs contains ALL the kdelibs branches So when you do git clone git://anongit.kde.org/kdelibs you end up with master (what was called trunk before) in a folder named kdelibs If you want to switch to a different branch, you just switch to it from within the same repository (folder), doing git checkout master git checkout KDE/4.7 git checkout KDE/4.6 etc You can view all the existing branches with git branch -a Then depending which branch you have checked out you need to push to the same branch (otherwise very bad things can happen), that is git push origin master git push origin KDE/4.7 git push origin KDE/4.6 This should give you a quick overview of how git works, but i recommend that you read some of the tutorials out there. If you do not have time for that, just send me the patches you need to commit to kdelibs. > How do these changes in kdelibs boil down to a distribution? Are they only > part of a minor release of KDE or is there a separate work flow for changes > that are made in the area where localized information is produced, like > kdelibs, but also in the i18n svn repository. So a distribution can > regularly pick up these packages, apart from the minor releases of KDE. Distributions use tarballs that we release with every minor release like they always have done. > > -- > fr.gr. > > Freek de Kruijf > ___ > kde-doc-english mailing list > kde-doc-english at kde.org > https://mail.kde.org/mailman/listinfo/kde-doc-english
[kde-doc-english] Frozen kdelibs, new entities and other Kate/KWrite troubles
On maandag 21 november 2011 00:07:58 Albert Astals Cid wrote: > A Diumenge, 20 de novembre de 2011, Freek de Kruijf v?reu escriure: > > On zondag 20 november 2011 23:21:13 Albert Astals Cid wrote: > > > > There is no kdelibs in branch, which is 4.7, so no kdelibs 4.7! > > > > > > Could not parse this sentence. > > > > What do you mean by that? Do you mean there is a kdelibs in git for > > trunk, branch and 4.6. If so please tell me, a recipe, how to use them, > > or rather how to update them. > > I mean i did not understand what you said at all with "There is no kdelibs > in branch, which is 4.7, so no kdelibs 4.7!". I am probably confused by the git concept. I have in my KDE trunk directory a directory kdelibs in which I import the git repository. So my view on this was that only KDE trunk was present there; currently 4.8. However later I got the recipe to enter a command "git push origin KDE/4.7", of which I did not really understand what it does. Thinking about that, my perception is now that this git directory looks like a turning stage with several different stages behind it, apparently a stage called trunk and one called 4.7 and maybe more. So do I have to give "git push origin KDE/4.7" to see and use 4.7? What command to see 4.8 and 4.6 and make changes in it. How do these changes in kdelibs boil down to a distribution? Are they only part of a minor release of KDE or is there a separate work flow for changes that are made in the area where localized information is produced, like kdelibs, but also in the i18n svn repository. So a distribution can regularly pick up these packages, apart from the minor releases of KDE. -- fr.gr. Freek de Kruijf
[kde-doc-english] Frozen kdelibs, new entities and other Kate/KWrite troubles
A Diumenge, 20 de novembre de 2011, Freek de Kruijf v?reu escriure: > On zondag 20 november 2011 23:21:13 Albert Astals Cid wrote: > > > There is no kdelibs in branch, which is 4.7, so no kdelibs 4.7! > > > > Could not parse this sentence. > > What do you mean by that? Do you mean there is a kdelibs in git for trunk, > branch and 4.6. If so please tell me, a recipe, how to use them, or rather > how to update them. I mean i did not understand what you said at all with "There is no kdelibs in branch, which is 4.7, so no kdelibs 4.7!". > > BTW are you aware you destroyed > > kdoctools/customization/entities/contributor.entities today with your > > commit 57b7c6c5094987c8cc1d94a50d1da447313cc944 ? > > Something went wrong, because the normal 3 git commands I use did not work; > creating the copy on my system (in principle only once) with: > > git clone kde:kdelibs and a definition in ~/.gitconfig > > updating with: > > git pull --rebase > > and after making a change the commit with: > > git commit -a -m 'update by Freek' > git push origin KDE/4.7 This is wrong, before doing the pull you need to be on the KDE/4.7 branch or things will go haywire, so before the pull do git checkout KDE/4.7 > I don't really understand what happens in git. I am just following a recipe. > Most likely I copied something the wrong way around and the update provided > an error. So I just tried 'git pull' and after that the commit. I did not > realize I did put something wrong in the repository. Well, your commit did work, just that the file you commited was missing half of the lines. This means your the file in your computer was also missing those lines and you did not check it before commiting or pushing. > I am very sorry. It's OK to make mistakes, we all do them, just be more careful the next time you do it ;-) Cheers, Albert > > -- > fr.gr. > > Freek de Kruijf > ___ > kde-doc-english mailing list > kde-doc-english at kde.org > https://mail.kde.org/mailman/listinfo/kde-doc-english
[kde-doc-english] Frozen kdelibs, new entities and other Kate/KWrite troubles
On zondag 20 november 2011 23:21:13 Albert Astals Cid wrote: > > There is no kdelibs in branch, which is 4.7, so no kdelibs 4.7! > > Could not parse this sentence. What do you mean by that? Do you mean there is a kdelibs in git for trunk, branch and 4.6. If so please tell me, a recipe, how to use them, or rather how to update them. > BTW are you aware you destroyed > kdoctools/customization/entities/contributor.entities today with your > commit 57b7c6c5094987c8cc1d94a50d1da447313cc944 ? Something went wrong, because the normal 3 git commands I use did not work; creating the copy on my system (in principle only once) with: git clone kde:kdelibs and a definition in ~/.gitconfig updating with: git pull --rebase and after making a change the commit with: git commit -a -m 'update by Freek' git push origin KDE/4.7 I don't really understand what happens in git. I am just following a recipe. Most likely I copied something the wrong way around and the update provided an error. So I just tried 'git pull' and after that the commit. I did not realize I did put something wrong in the repository. I am very sorry. -- fr.gr. Freek de Kruijf
[kde-doc-english] Frozen kdelibs, new entities and other Kate/KWrite troubles
A Divendres, 18 de novembre de 2011, Freek de Kruijf v?reu escriure: > On donderdag 17 november 2011 18:50:51 Burkhard L?ck wrote: > > Am Donnerstag, 17. November 2011, 09:04:54 schrieb Yuri Chornoivan: > > > 1. The heat discussions in kde-core-devel show that will be no > > > kdelibs > > > 4.8 (just distribution forks with fixes) as Aaron and other > > > developers want to split libs into "frameworks", which will be > > > released not earlier than in KDE 4.10 cycle. > > > > > > Will the new documentation with the new entities from kdedoctools be > > > compilable without distribution patches in 4.8 cycle? > > > > Afaik 4.8 will be released with kdelibs 4.7, so commit new entities for > > kdedoctools to 4.7+frameworks. > > There is no kdelibs in branch, which is 4.7, so no kdelibs 4.7! Could not parse this sentence. BTW are you aware you destroyed kdoctools/customization/entities/contributor.entities today with your commit 57b7c6c5094987c8cc1d94a50d1da447313cc944 ? Cheers, Albert > > -- > fr.gr. > > Freek de Kruijf > ___ > kde-doc-english mailing list > kde-doc-english at kde.org > https://mail.kde.org/mailman/listinfo/kde-doc-english
[kde-doc-english] Frozen kdelibs, new entities and other Kate/KWrite troubles
On donderdag 17 november 2011 18:50:51 Burkhard L?ck wrote: > Am Donnerstag, 17. November 2011, 09:04:54 schrieb Yuri Chornoivan: > > 1. The heat discussions in kde-core-devel show that will be no kdelibs > > 4.8 (just distribution forks with fixes) as Aaron and other developers > > want to split libs into "frameworks", which will be released not earlier > > than in KDE 4.10 cycle. > > > > Will the new documentation with the new entities from kdedoctools be > > compilable without distribution patches in 4.8 cycle? > > Afaik 4.8 will be released with kdelibs 4.7, so commit new entities for > kdedoctools to 4.7+frameworks. There is no kdelibs in branch, which is 4.7, so no kdelibs 4.7! -- fr.gr. Freek de Kruijf
[kde-doc-english] Frozen kdelibs, new entities and other Kate/KWrite troubles
Am Donnerstag, 17. November 2011, 09:04:54 schrieb Yuri Chornoivan: > 1. The heat discussions in kde-core-devel show that will be no kdelibs > 4.8 (just distribution forks with fixes) as Aaron and other developers > want to split libs into "frameworks", which will be released not earlier > than in KDE 4.10 cycle. > > Will the new documentation with the new entities from kdedoctools be > compilable without distribution patches in 4.8 cycle? Afaik 4.8 will be released with kdelibs 4.7, so commit new entities for kdedoctools to 4.7+frameworks. Thanks. -- Burkhard L?ck
[kde-doc-english] Frozen kdelibs, new entities and other Kate/KWrite troubles
Am Donnerstag, 17. November 2011, 09:04:54 schrieb Yuri Chornoivan: > > 2. It seems that something went wrong with new Kate/KWrite docs. The > translation cannot be compiled as > > > po2xml documentation/kde-baseapps/kate/index.docbook > uk/docmessages/kde-baseapps/kate.po > can't find > "> > in > > ERROR: po2xml documentation/kde-baseapps/kate/index.docbook > uk/docmessages/kde-baseapps/kate.po failed! Exiting! > > Use in kate/index.docbook something like (maybe more descriptive): Comment () in translatable entities does not work. @ T.C. What's the reason for http://commits.kde.org/kate/1bf2a8c87dfed803b371e861c7f7a680055d083a ? @ Albert: please don't care about kate/kwrite, I'll merge/spilt translation catalogs. Thanks. -- Burkhard L?ck
[kde-doc-english] Frozen kdelibs, new entities and other Kate/KWrite troubles
Hi! 1. The heat discussions in kde-core-devel show that will be no kdelibs 4.8 (just distribution forks with fixes) as Aaron and other developers want to split libs into "frameworks", which will be released not earlier than in KDE 4.10 cycle. Will the new documentation with the new entities from kdedoctools be compilable without distribution patches in 4.8 cycle? 2. It seems that something went wrong with new Kate/KWrite docs. The translation cannot be compiled as po2xml documentation/kde-baseapps/kate/index.docbook uk/docmessages/kde-baseapps/kate.po can't find "> in ERROR: po2xml documentation/kde-baseapps/kate/index.docbook uk/docmessages/kde-baseapps/kate.po failed! Exiting! Is there any way to fix this without possible breakage of the new structure? Thanks in advance for your answers. Best regards, Yuri
[kde-doc-english] Frozen kdelibs, new entities and other Kate/KWrite troubles
On Thu, Nov 17, 2011 at 6:59 AM, Burkhard L?ck wrote: > Am Donnerstag, 17. November 2011, 09:04:54 schrieb Yuri Chornoivan: >> >> 2. It seems that something went wrong with new Kate/KWrite docs. The >> translation cannot be compiled as >> >> >> po2xml documentation/kde-baseapps/kate/index.docbook >> uk/docmessages/kde-baseapps/kate.po >> can't find >> "> >> in >> >> ERROR: po2xml documentation/kde-baseapps/kate/index.docbook >> uk/docmessages/kde-baseapps/kate.po failed! Exiting! >> >> > > Use in kate/index.docbook something like (maybe more descriptive): > ? > ? > > Comment () in translatable entities does not work. Fixed in http://commits.kde.org/kate/614b3d3789a91d5b9bf8ea1ca8796b084cceec67 > @ T.C. > What's the reason for > http://commits.kde.org/kate/1bf2a8c87dfed803b371e861c7f7a680055d083a ? I moved part.docbook and configuring-part.docbook into kwrite at some point while I was working on the split. AFAIK, it really doesn't matter where they are, and I figured it was better for at least the former to stay where it always was to prevent unnecessary translation movement. My description of where things moved in kde-i18n-doc reflects this commit. -T.C.
[kde-doc-english] Frozen kdelibs, new entities and other Kate/KWrite troubles
On Thu, Nov 17, 2011 at 1:41 AM, T.C. Hollingsworth wrote: > I tried to reproduce this, but Fedora's po2xml appears to be broken. > [1] ?I'll get back to you on this as soon as I can sort that out. Ubuntu 11.10's po2xml crashes too. I filed a bug in the KDE bugtracker now: https://bugs.kde.org/show_bug.cgi?id=286834 Building from SVN doesn't seem to help either. :-( -T.C.
[kde-doc-english] Frozen kdelibs, new entities and other Kate/KWrite troubles
Hi Yuri! On Thu, Nov 17, 2011 at 1:04 AM, Yuri Chornoivan wrote: > Hi! > > 1. The heat discussions in kde-core-devel show that will be no kdelibs 4.8 > (just distribution forks with fixes) as Aaron and other developers want to > split libs into "frameworks", which will be released not earlier than in KDE > 4.10 cycle. > > Will the new documentation with the new entities from kdedoctools be > compilable without distribution patches in 4.8 cycle? The only new entities from kdoctools used by Kate are new author entities, which appear to be shipped as of kdelibs 4.7.3. $ rpm -q kdelibs kdelibs-4.7.3-2.fc16.x86_64 $ grep Hollingsworth /usr/share/kde4/apps/ksgmltools2/customization/entities/contributor.entities T.C.Hollingsworth'> tchollingsworth at gmail.com'> > 2. It seems that something went wrong with new Kate/KWrite docs. The > translation cannot be compiled as > > > po2xml documentation/kde-baseapps/kate/index.docbook > uk/docmessages/kde-baseapps/kate.po > can't find > "> > in > > ERROR: po2xml documentation/kde-baseapps/kate/index.docbook > uk/docmessages/kde-baseapps/kate.po failed! Exiting! > > > Is there any way to fix this without possible breakage of the new structure? I tried to reproduce this, but Fedora's po2xml appears to be broken. [1] I'll get back to you on this as soon as I can sort that out. -T.C. [1] https://bugzilla.redhat.com/show_bug.cgi?id=754643
