search

cooljeanius / The_Earths_Gut

The Earth's Gut (TEG) is a Wesnoth add-on campaign; originally by @anonymissimus
https://forums.wesnoth.org/viewtopic.php?f=8&t=26800
GNU General Public License v2.0
6 stars 6 forks source link

update POT and ja.po/mo #49

Closed k-konami closed 1 year ago

k-konami commented 1 year ago

for wose shaman description ( Wose_Shaman.cfg ) (and another untranslated item ... 21_Wesnoth_soldiers.cfg:310 )

cooljeanius commented 1 year ago

for wose shaman description (Wose_Shaman.cfg) (and another untranslated item ... 21_Wesnoth_soldiers.cfg:310)

  • The difference file is large, but the only differences on the po file are the above two points.

  • If the POT file looks wrong, I am sorry, but please recreate it.

I think the difference might be due to whether or not the --no-sort-by-file flag is passed to wmlxgettext or not; let me regenerate the potfile myself...

cooljeanius commented 1 year ago

for wose shaman description (Wose_Shaman.cfg) (and another untranslated item ... 21_Wesnoth_soldiers.cfg:310)

  • The difference file is large, but the only differences on the po file are the above two points.

  • If the POT file looks wrong, I am sorry, but please recreate it.

I think the difference might be due to whether or not the --no-sort-by-file flag is passed to wmlxgettext or not; let me regenerate the potfile myself...

OK I regenerated it myself in 3fd9f64; of course, now there are merge conflicts that need resolving...

k-konami commented 1 year ago

Hmmm, I don't know how to use RESOLVE CONFLICTs, can you tell me what to do? I am not even able to REVERT.

cooljeanius commented 1 year ago

oh yeah, resolving merge conflicts can be difficult at times; it might be better to just start with a fresh pull request from a separate branch...

k-konami commented 1 year ago

oh yeah, resolving merge conflicts can be difficult at times; it might be better to just start with a fresh pull request from a separate branch...

Thanks, I'll give it a try, but I can't even consider how it would work. It might take a little time. hmm..