Have these patches been committed?Cjkjvfnby wrote:Bunch of minor patches. order matters.
1 fix small typos in en and de (remove links to unexisting keys)
2 reformat files with scripts (make it looks more like english, remove obsolete keys)
3 small fix for fr file
English stringtable
Re: English stringtable
Re: English stringtable
upd.Vezzra wrote:Have these patches been committed?Cjkjvfnby wrote:Bunch of minor patches. order matters.
1 fix small typos in en and de (remove links to unexisting keys)
2 reformat files with scripts (make it looks more like english, remove obsolete keys)
3 small fix for fr file
Will split patches in different way.
Patch with misk fixes fixes.patch. prewiev: https://github.com/freeorion/freeorion/pull/6/files
Patch with cleanup russian translation. I remove some untranslated entries (all that same as in en and some others.).
Patch with adding exact names of robo hulls to Robotic shield description.
- Attachments
-
[The extension patch has been deactivated and can no longer be displayed.]
-
[The extension patch has been deactivated and can no longer be displayed.]
-
[The extension patch has been deactivated and can no longer be displayed.]
If I provided any code, scripts or other content here, it's released under GPL 2.0 and CC-BY-SA 3.0
Re: English stringtable
I tried to apply these patches in this order:
Sidenote: fixes.patch and RoboShieldPatch.patch had "FreeOrion" at the start of the path of the patched files. Try to avoid that, makes applying your patches easier.
- fixes.patch
- ru_cleanup.patch
- RoboShieldPatch.patch
Sidenote: fixes.patch and RoboShieldPatch.patch had "FreeOrion" at the start of the path of the patched files. Try to avoid that, makes applying your patches easier.
Re: English stringtable
I am on vacation for two weeks, will check it on return. Just forget about ru patch.Vezzra wrote:
That didn't work. ru_cleanup.patch does not apply cleanly, lots of rejected chunks. The other two apply fine. Do I need to apply them in a different order?
Sidenote: fixes.patch and RoboShieldPatch.patch had "FreeOrion" at the start of the path of the patched files. Try to avoid that, makes applying your patches easier.
Sorry for missed FreeOrion, I remove its manually.
If I provided any code, scripts or other content here, it's released under GPL 2.0 and CC-BY-SA 3.0
Re: English stringtable
So, can I apply the other two without the ru patch?Cjkjvfnby wrote:Just forget about ru patch.
I've already done that for these patches, so no need to repost them, just keep it in mind for future patches.Sorry for missed FreeOrion, I remove its manually.
Re: English stringtable
Yes. You can commit them.Vezzra wrote:So, can I apply the other two without the ru patch?Cjkjvfnby wrote:Just forget about ru patch.I've already done that for these patches, so no need to repost them, just keep it in mind for future patches.Sorry for missed FreeOrion, I remove its manually.
If I provided any code, scripts or other content here, it's released under GPL 2.0 and CC-BY-SA 3.0
Re: English stringtable
Done.Cjkjvfnby wrote:Yes. You can commit them.
Re: English stringtable
The patch below add “Death Spores only work against Organic species” to the Death Spores Description of the stringtables en.txt
- Attachments
-
[The extension patch has been deactivated and can no longer be displayed.]
Re: English stringtable
Just to go on about Sit Rep, I propose the following wording:
SITREP_OWN_SHIP_DESTROYED_AT_SYSTEM
At %system%: an %empire% ship of class % shipdesign % was destroyed.
SITREP_SHIP_DESTROYED_AT_SYSTEM
At %system%: an %empire% ship of class % shipdesign % was destroyed.
SITREP_UNOWNED_SHIP_DESTROYED_AT_SYSTEM
At %system%: a ship of class %shipdesign% was destroyed.
SITREP_SHIP_DAMAGED_AT_SYSTEM
At %system%: '%ship%', a ship from %empire% was damaged.
SITREP_UNOWNED_SHIP_DAMAGED_AT_SYSTEM
At %system%: a ship of class %shipdesign% was damaged.
This patch belongs to en.txt (r7820).
SITREP_OWN_SHIP_DESTROYED_AT_SYSTEM
At %system%: an %empire% ship of class % shipdesign % was destroyed.
SITREP_SHIP_DESTROYED_AT_SYSTEM
At %system%: an %empire% ship of class % shipdesign % was destroyed.
SITREP_UNOWNED_SHIP_DESTROYED_AT_SYSTEM
At %system%: a ship of class %shipdesign% was destroyed.
SITREP_SHIP_DAMAGED_AT_SYSTEM
At %system%: '%ship%', a ship from %empire% was damaged.
SITREP_UNOWNED_SHIP_DAMAGED_AT_SYSTEM
At %system%: a ship of class %shipdesign% was damaged.
This patch belongs to en.txt (r7820).
- Attachments
-
[The extension patch has been deactivated and can no longer be displayed.]
Re: English stringtable
In the FR thread I mentioned some considerations I thought were significant for these sitreps, and made a particular proposal for the destroyed ship sitreps. You had repliedshivu wrote:Just to go on about Sit Rep, I propose the following wording:
Now you're making some very contrary proposals-- what's your reasoning?shivu wrote:Short, good, but only for English.
If I provided any code, scripts or other content here, it's released under GPL 2.0 and CC-BY-SA 3.0
Re: English stringtable
I have interpreted the posting of MatGB as a invitation to participle to a discussion and make proposals. Perhaps I was wrong and it was only a “Declaration of Intent”. In this case, it’s only a misunderstanding and I will retire my Proposal.Dilvish wrote:Now you're making some very contrary proposals-- what's your reasoning?
Re: English stringtable
You are certainly welcome to participate in the discussion and to make proposals; if you look again I think you'll see that my statement was asking you to participate more fully by explaining your proposal...shivu wrote:I have interpreted the posting of MatGB as a invitation to participle to a discussion and make proposals. Perhaps I was wrong and it was only a “Declaration of Intent”. In this case, it’s only a misunderstanding and I will retire my Proposal.Dilvish wrote:Now you're making some very contrary proposals-- what's your reasoning?
If I provided any code, scripts or other content here, it's released under GPL 2.0 and CC-BY-SA 3.0
Re: English stringtable
Ok, I will do two things.Dilvish wrote:my statement was asking you to participate more fully by explaining your proposal...
1) Explain my proposal
2) Make an equivalent patch in German and in French
This will take a bit time, pls get patience.
Re: English stringtable
To clarify myself a little-- I think I already understand enough of your reasoning about why an equivalent proposal would be good for French and German. I have no objection to that (I have given an opinion about what pieces of information are most important, for any language, but my knowledge of French and German is far too scant to voice an opinion about what the best phrasing in those languages would be). Unless Ouaz or Vezzra want to discuss those proposals more, you might not need to take the time to write out an explanation of them. I was just not understanding what the reasons would be for this proposed change to the English stringtable.shivu wrote:Ok, I will do two things.
1) Explain my proposal
2) Make an equivalent patch in German and in French
If I provided any code, scripts or other content here, it's released under GPL 2.0 and CC-BY-SA 3.0