English stringtable

Discuss, plan, and make Translations for FreeOrion
Message
Author
User avatar
Vezzra
Release Manager, Design
Posts: 4666
Joined: Wed Nov 16, 2011 12:56 pm
Location: Sol III

Re: English stringtable

#31 Post by Vezzra » Tue Dec 23, 2014 12:54 pm

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
Have these patches been committed?

User avatar
Cjkjvfnby
AI Contributor
Posts: 452
Joined: Tue Jun 24, 2014 9:55 pm

Re: English stringtable

#32 Post by Cjkjvfnby » Tue Dec 23, 2014 6:55 pm

Vezzra wrote:
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
Have these patches been committed?
upd.
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

User avatar
Vezzra
Release Manager, Design
Posts: 4666
Joined: Wed Nov 16, 2011 12:56 pm
Location: Sol III

Re: English stringtable

#33 Post by Vezzra » Sun Dec 28, 2014 4:19 pm

I tried to apply these patches in this order:
  • fixes.patch
  • ru_cleanup.patch
  • RoboShieldPatch.patch
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.

User avatar
Cjkjvfnby
AI Contributor
Posts: 452
Joined: Tue Jun 24, 2014 9:55 pm

Re: English stringtable

#34 Post by Cjkjvfnby » Sun Dec 28, 2014 10:57 pm

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.
I am on vacation for two weeks, will check it on return. Just forget about ru patch.

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

User avatar
Vezzra
Release Manager, Design
Posts: 4666
Joined: Wed Nov 16, 2011 12:56 pm
Location: Sol III

Re: English stringtable

#35 Post by Vezzra » Mon Dec 29, 2014 1:39 pm

Cjkjvfnby wrote:Just forget about ru patch.
So, can I apply the other two without the ru patch?
Sorry for missed FreeOrion, I remove its manually.
I've already done that for these patches, so no need to repost them, just keep it in mind for future patches.

User avatar
Cjkjvfnby
AI Contributor
Posts: 452
Joined: Tue Jun 24, 2014 9:55 pm

Re: English stringtable

#36 Post by Cjkjvfnby » Mon Dec 29, 2014 2:22 pm

Vezzra wrote:
Cjkjvfnby wrote:Just forget about ru patch.
So, can I apply the other two without the ru patch?
Sorry for missed FreeOrion, I remove its manually.
I've already done that for these patches, so no need to repost them, just keep it in mind for future patches.
Yes. You can commit them.
If I provided any code, scripts or other content here, it's released under GPL 2.0 and CC-BY-SA 3.0

User avatar
Vezzra
Release Manager, Design
Posts: 4666
Joined: Wed Nov 16, 2011 12:56 pm
Location: Sol III

Re: English stringtable

#37 Post by Vezzra » Mon Dec 29, 2014 2:53 pm

Cjkjvfnby wrote:Yes. You can commit them.
Done.

shivu

Re: English stringtable

#38 Post by shivu » Wed Jan 07, 2015 10:09 am

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.]


User avatar
Vezzra
Release Manager, Design
Posts: 4666
Joined: Wed Nov 16, 2011 12:56 pm
Location: Sol III

Re: English stringtable

#39 Post by Vezzra » Wed Jan 07, 2015 11:42 am


shivu

Re: English stringtable

#40 Post by shivu » Sat Jan 24, 2015 2:05 am

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).
Attachments

[The extension patch has been deactivated and can no longer be displayed.]


User avatar
Dilvish
AI Lead, Programmer
Posts: 4712
Joined: Sat Sep 22, 2012 6:25 pm

Re: English stringtable

#41 Post by Dilvish » Sat Jan 24, 2015 2:38 am

shivu wrote:Just to go on about Sit Rep, I propose the following wording:
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 replied
shivu wrote:Short, good, but only for English.
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

shivu

Re: English stringtable

#42 Post by shivu » Sat Jan 24, 2015 2:47 pm

Dilvish wrote:Now you're making some very contrary proposals-- what's your reasoning?
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.

User avatar
Dilvish
AI Lead, Programmer
Posts: 4712
Joined: Sat Sep 22, 2012 6:25 pm

Re: English stringtable

#43 Post by Dilvish » Sat Jan 24, 2015 3:11 pm

shivu wrote:
Dilvish wrote:Now you're making some very contrary proposals-- what's your reasoning?
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.
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...
If I provided any code, scripts or other content here, it's released under GPL 2.0 and CC-BY-SA 3.0

shivu

Re: English stringtable

#44 Post by shivu » Sat Jan 24, 2015 3:27 pm

Dilvish wrote:my statement was asking you to participate more fully by explaining your proposal...
Ok, I will do two things.
1) Explain my proposal
2) Make an equivalent patch in German and in French
This will take a bit time, pls get patience.

User avatar
Dilvish
AI Lead, Programmer
Posts: 4712
Joined: Sat Sep 22, 2012 6:25 pm

Re: English stringtable

#45 Post by Dilvish » Sat Jan 24, 2015 3:56 pm

shivu wrote:Ok, I will do two things.
1) Explain my proposal
2) Make an equivalent patch in German and in French
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.
If I provided any code, scripts or other content here, it's released under GPL 2.0 and CC-BY-SA 3.0

Post Reply