Skip to content
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.

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

Update full_file_fr.txt #3

Merged
merged 1 commit into from Apr 14, 2015
Merged

Update full_file_fr.txt #3

merged 1 commit into from Apr 14, 2015

Conversation

Ouaz
Copy link

@Ouaz Ouaz commented Apr 14, 2015

  • On par with en.txt in freeorion/freeorion/master (from Apr 13, 2015 commit d489d44)
  • Clean the unnecessary spaces at the end of some lines (typos in the fr file which produced unnecessary triple quotes)

- On par with en.txt in freeorion/freeorion/master (from Apr 13, 2015 commit d489d44)
- Clean the unnecessary spaces at the end of some lines (typos in the fr file which produced unnecessary triple quotes)
Cjkjvfnby added a commit that referenced this pull request Apr 14, 2015
Update full_file_fr.txt
@Cjkjvfnby Cjkjvfnby merged commit 48597bb into Cjkjvfnby:full_files_for_Quaz Apr 14, 2015
@Ouaz Ouaz deleted the patch-1 branch April 14, 2015 19:51
Cjkjvfnby pushed a commit that referenced this pull request Apr 20, 2015
Cjkjvfnby pushed a commit that referenced this pull request Feb 1, 2017
Make AddressSanitizer happy.
==5832==ERROR: AddressSanitizer: global-buffer-overflow on address 0x7f602f2e2925 at pc 0x7f602e81ce91 bp 0x7ffcdd76f600 sp 0x7ffcdd76f5f0
READ of size 1 at 0x7f602f2e2925 thread T0
    #0 0x7f602e81ce90 in std::char_traits<char>::length(char const*) /usr/lib/gcc/x86_64-pc-linux-gnu/4.9.4/include/g++-v4/bits/char_traits.h:263
    #1 0x7f602e81ce90 in std::string::append(char const*) /usr/lib/gcc/x86_64-pc-linux-gnu/4.9.4/include/g++-v4/bits/basic_string.h:1025
    #2 0x7f602e81ce90 in std::string::operator+=(char const*) /usr/lib/gcc/x86_64-pc-linux-gnu/4.9.4/include/g++-v4/bits/basic_string.h:958
    #3 0x7f602e81ce90 in ProductionQueue::ProductionItem::Dump() const /mnt/another/srcs/GIT/freeorion/Empire/Empire.cpp:774
0x7f602f2e2925 is located 0 bytes to the right of global variable '*.LC128' from '/mnt/another/srcs/GIT/freeorion/Empire/Empire.cpp' (0x7f602f2e2920) of size 5
  '*.LC128' is ascii string 'id: '
0x7f602f2e2925 is located 59 bytes to the left of global variable '*.LC129' from '/mnt/another/srcs/GIT/freeorion/Empire/Empire.cpp' (0x7f602f2e2960) of size 27
  '*.LC129' is ascii string 'ProductionQueue::Element ('
SUMMARY: AddressSanitizer: global-buffer-overflow /usr/lib/gcc/x86_64-pc-linux-gnu/4.9.4/include/g++-v4/bits/char_traits.h:263 std::char_traits<char>::length(char const*)
Cjkjvfnby pushed a commit that referenced this pull request Feb 21, 2022
…rian

- for the nightsiders see also https://www.freeorion.org/forum/viewtopic.php?p=109222#p109222
- for the sleepers see also https://www.freeorion.org/forum/viewtopic.php?f=7&t=12241
- for the khakturian see also https://www.freeorion.org/forum/viewtopic.php?f=7&t=12242
- reworked their icons so they are similar to but distinct from the preexisting species icons
- adding likes and dislikes with motivational comments to species definitions, partly translated into player readable pedia page texts
- grooming typos crossing the t's and dotting the i's
- moving the effect 'Light Sensitive' from banforo species definition to common population macros because the nightsiders share that trait
- added logging when preferred native focus not available during universe creation
- changed condition for availability of FOCUS_PROTECTION so that some native species with that same preferred focus can now do that while not yet conquored
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants