New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SotA] Gwyllin vs Gwillyn #2844

Closed

Gallaecio opened this issue Apr 7, 2018 · 4 comments

Labels

Bug

Gallaecio commented Apr 7, 2018

Translating the campaign, I noticed that there is a unit called Gwillyn, (first i, the y), and there is a dialog message that mentions a unit by name, calling that unit Gwyllin (first y, then i).

I suspect they are meant to be one and the same, and that one of the two forms of the name should be chosen and applied in both cases.

CelticMinstrel added the Bug label

Member

CelticMinstrel commented Apr 7, 2018

I like "Gwyllin" better, but I'm not sure if it's the more Welsh-like of the two. (I say Welsh-like because the Wesnoth names are at least partly Welsh-based.)

Vultraz closed this as completed in

77863cc

Vultraz added a commit that referenced this issue


          SotA S2: fixed inconsistency between unit name and dialog (fixes #2844)

ab9f29a

[ci skip]

Author

Gallaecio commented Apr 8, 2018

@Vultraz On the 1.14 branch? Doesn’t this break string freeze?

Member

Vultraz commented Apr 8, 2018

I added a pofix rule... though I didn't run pofix.

Member

CelticMinstrel commented Apr 8, 2018 •

edited

For the uninitiated, pofix is basically a way to fix typos without breaking string freeze... assuming it's used properly, which means running it after you add a rule and confirming it actually changes relevant files.

irydacea added a commit that referenced this issue


          Revert string changes in SotA for 1.14 RC 3 - gold

f843a0e

This reverts the following commits:

 * "SotA S2: fixed inconsistency between unit name and dialog (fixes #2844)" - commit ab9f29a
 * "SotA S8: fixed inconsistent Ghost name (fixes #2846)" - commit fc6c3ac

irydacea added a commit to irydacea/wesnoth that referenced this issue


          Re-apply patches to fix issues wesnoth#2844 and wesnoth#2846 in SotA

This restores the changes from the following commits:

 * "SotA S2: fixed inconsistency between unit name and dialog (fixes wesnoth#2844)" - commit ab9f29a
 * "SotA S8: fixed inconsistent Ghost name (fixes wesnoth#2846)" - commit fc6c3ac

irydacea mentioned this issue

SotA: Restore fixes for issues #2844 and #2846 on 1.14 #2898

Merged

irydacea added a commit that referenced this issue


          Re-apply patches to fix issues #2844 and #2846 in SotA

97cc0f8

This restores the changes from the following commits:

 * "SotA S2: fixed inconsistency between unit name and dialog (fixes #2844)" - commit ab9f29a
 * "SotA S8: fixed inconsistent Ghost name (fixes #2846)" - commit fc6c3ac

jostephd pushed a commit to jostephd/wesnoth that referenced this issue


          SotA S2: fixed inconsistency between unit name and dialog (fixes wesn…

80cf444

…oth#2844)

[ci skip]

jostephd pushed a commit to jostephd/wesnoth that referenced this issue


          SotA S2: fixed inconsistency between unit name and dialog (fixes wesn…

1bd2200

…oth#2844)

[ci skip]

(cherry-picked from commit 77863cc)

jostephd mentioned this issue

Forward-port 1.14 to development #3614

Closed

jostephd pushed a commit to jostephd/wesnoth that referenced this issue


          Revert string changes in SotA for 1.14 RC 3 - gold

9b158d7

This reverts the following commits:

 * "SotA S2: fixed inconsistency between unit name and dialog (fixes wesnoth#2844)" - commit ab9f29a
 * "SotA S8: fixed inconsistent Ghost name (fixes wesnoth#2846)" - commit fc6c3ac

(cherry picked from commit f843a0e)

jostephd pushed a commit to jostephd/wesnoth that referenced this issue


          Re-apply patches to fix issues wesnoth#2844 and wesnoth#2846 in SotA

8d8a835

This restores the changes from the following commits:

 * "SotA S2: fixed inconsistency between unit name and dialog (fixes wesnoth#2844)" - commit ab9f29a
 * "SotA S8: fixed inconsistent Ghost name (fixes wesnoth#2846)" - commit fc6c3ac

(cherry picked from commit 97cc0f8)

jostephd pushed a commit to jostephd/wesnoth that referenced this issue


          Revert string changes in SotA for 1.14 RC 3 - gold

bcd1040

This reverts the following commits:

 * "SotA S2: fixed inconsistency between unit name and dialog (fixes wesnoth#2844)" - commit ab9f29a
 * "SotA S8: fixed inconsistent Ghost name (fixes wesnoth#2846)" - commit fc6c3ac

(cherry picked from commit f843a0e)

jostephd pushed a commit to jostephd/wesnoth that referenced this issue


          Re-apply patches to fix issues wesnoth#2844 and wesnoth#2846 in SotA

a611e82

This restores the changes from the following commits:

 * "SotA S2: fixed inconsistency between unit name and dialog (fixes wesnoth#2844)" - commit ab9f29a
 * "SotA S8: fixed inconsistent Ghost name (fixes wesnoth#2846)" - commit fc6c3ac

(cherry picked from commit 97cc0f8)

jostephd pushed a commit to jostephd/wesnoth that referenced this issue


          Revert string changes in SotA for 1.14 RC 3 - gold

b627a74

This reverts the following commits:

 * "SotA S2: fixed inconsistency between unit name and dialog (fixes wesnoth#2844)" - commit ab9f29a
 * "SotA S8: fixed inconsistent Ghost name (fixes wesnoth#2846)" - commit fc6c3ac

(cherry picked from commit f843a0e)

jostephd pushed a commit to jostephd/wesnoth that referenced this issue


          Re-apply patches to fix issues wesnoth#2844 and wesnoth#2846 in SotA

014a65a

This restores the changes from the following commits:

 * "SotA S2: fixed inconsistency between unit name and dialog (fixes wesnoth#2844)" - commit ab9f29a
 * "SotA S8: fixed inconsistent Ghost name (fixes wesnoth#2846)" - commit fc6c3ac

(cherry picked from commit 97cc0f8)

jostephd pushed a commit to jostephd/wesnoth that referenced this issue


          Revert string changes in SotA for 1.14 RC 3 - gold

5dc2120

This reverts the following commits:

 * "SotA S2: fixed inconsistency between unit name and dialog (fixes wesnoth#2844)" - commit ab9f29a
 * "SotA S8: fixed inconsistent Ghost name (fixes wesnoth#2846)" - commit fc6c3ac

(cherry picked from commit f843a0e)

jostephd pushed a commit to jostephd/wesnoth that referenced this issue


          Re-apply patches to fix issues wesnoth#2844 and wesnoth#2846 in SotA

afb34eb

This restores the changes from the following commits:

 * "SotA S2: fixed inconsistency between unit name and dialog (fixes wesnoth#2844)" - commit ab9f29a
 * "SotA S8: fixed inconsistent Ghost name (fixes wesnoth#2846)" - commit fc6c3ac

(cherry picked from commit 97cc0f8)

jostephd pushed a commit to jostephd/wesnoth that referenced this issue


          Revert string changes in SotA for 1.14 RC 3 - gold

947cae0

This reverts the following commits:

 * "SotA S2: fixed inconsistency between unit name and dialog (fixes wesnoth#2844)" - commit ab9f29a
 * "SotA S8: fixed inconsistent Ghost name (fixes wesnoth#2846)" - commit fc6c3ac

(cherry picked from commit f843a0e)

jostephd pushed a commit to jostephd/wesnoth that referenced this issue


          Re-apply patches to fix issues wesnoth#2844 and wesnoth#2846 in SotA

3c4de1b

This restores the changes from the following commits:

 * "SotA S2: fixed inconsistency between unit name and dialog (fixes wesnoth#2844)" - commit ab9f29a
 * "SotA S8: fixed inconsistent Ghost name (fixes wesnoth#2846)" - commit fc6c3ac

(cherry picked from commit 97cc0f8)

jostephd added a commit that referenced this issue


          Merge remote-tracking branch 'josteph/forward-port-some-of-the-174'

f1a5bd0

* josteph/forward-port-some-of-the-174:
  don't call invalidate_layout() unless needed
  Convert a bunch more C-style casts I missed in 0dc5656 to static_cast
  fixup  don't show travis notifications from forks (cherry picked from commit 55bc62f)
  don't show travis notifications from forks (cherry picked from commit d6ab780)
  fix out of bonunds check
  Lua: Invalidate layout in set_dialog_value()
  Fix includes
  Implement iOS version detection
  Game Load: Use child_or_empty().
  Themes: Fix the observers icon being hidden under the minimap
  Game Load: Restore the ability to select 1.12.6 savegames in the list
  Fix CMake build on macOS
  NR S8: compatibility commit to make the new companions from scratch if we don't have them stored
  Partially revert "Additional village variations (#3342)"
  DM: Add last breath dialog for Zorlan
  DM: Generalize death message so it works when Delfador is young and old
  gui2/unit_recall: Change Recall button back to its correct label
  Updated changelog in Xcode
  Add WML unit test for unupgradable (#3336)
  gui2/unit_recall: Fix i18n issues
  DM: add some TODOs
  iOS: finger scrolling in controls.
  iOS document directories. Might use these on other platforms as well.
  .gitignore for CLion
  German multiplayer translation: fixes
  German translation: reword era descriptions
  German translation: fix a string
  Statistics Dialog: merge unit name and count labels
  add / remove some comments
  Tutorial Part2: Give the player a canche to undo his move
  UtBS 5: changes to scenario locations (#3104)
  Update changelog in macOS package
  SotA: transform bats already after the 5th scenario
  TRoW: revert workaround for #2912
  Changelog entry for the #2912 work around
  TRoW: Increase Rithrandil's workaround portrait height to 700
  TRoW: IPF-downscale Rithrandil's portrait, as a workaround to #2912
  Add missing deprecation messages for deprecated macros
  Northern Rebirth S02_01: keep side 8 leader from wandering off too far
  changelog: remove AToTB AI entry
  wesnothd: prevent another instance of crash from owner not in player_connections
  Increased in-game chat size. This makes it render more smoothly
  Minor tweaks to classic theme (thanks enclave for doing this)
  Update RELEASE_NOTES (cherry picked from commit e2a2a85)
  Update changelog for custom AI for AToTB S2
  TRoW: revert changes, to avoid a potential OOS
  Re-apply patches to fix issues #2844 and #2846 in SotA
  Clear RELEASE_NOTES
  Repair 66ab35f in the upwards direction
  Add changelog for 1.14.0
  add placeholer links to appdata file
  Hide Editor help section
  UtBS: readd do_not_list
  UtBS: wmlindent pass
  Fix MP label for #2855
  Fixup 601c67d
  UtBS: Re-added compatibility code to load old saves using the new elves
  Swap count and name columns in statistics (fixes #2893)
  Revert string changes in SotA for 1.14 RC 3 - gold
  AI recruitment: use unit-specific recall cost
  AI recruitment: fix units on recall list interfering with recruiting
  Fixup f7ab008 before GCC complains about an unused parameter >_<
  Help: disabled parsing error popup
  LoW: Fix translation error in conjunct list (fixes #2833) (#2834)
  Fix pofix
  Changelog entry for recent SotA fixes
  Pofix entry for fc6c3ac
  Pofix entry for b86a296
  Pofix entry for ab9f29a
  Fix HP label in longer languages
  Help: removed sort_sections key with invalid value
  less redraw_everything calls when receiving [change_controller]
  fix gui2 dialog disappearing after [change_controller]
  Use a fallback for when the player name is not known in debug notifications

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment