Skip to content

Commit

Permalink
added Settings : scavenger, shoreline, Patrolduty (#1988)
Browse files Browse the repository at this point in the history 
* added Settings : scavenger, shoreline, Patrolduty

* Update scenario_47_scavenger.fr.po

* update scenario_54_PatrolDuty.fr.po

* Update scenario_57_shoreline.fr.po
  • Loading branch information
@muerteFR
muerteFR authored Jun 14, 2023
1 parent 7e9f1e8 commit f8145cc
Show file tree
Hide file tree
Showing 15 changed files with 3,034 additions and 2,681 deletions.
6 changes: 3 additions & 3 deletions scripts/locale/scenario_00_basic.fr.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ msgstr ""
# Scenario setting
msgctxt "setting"
msgid "Enemies"
msgstr "Ennemis"
msgstr "Puissance ennemie"

msgctxt "setting"
msgid "Configures the amount of enemies spawned in the scenario."
Expand Down Expand Up @@ -85,7 +85,7 @@ msgstr "Moins d'ennemis. Recommandé pour les équipages inexpérimentés."

msgctxt "Enemies"
msgid "Normal"
msgstr "Normal"
msgstr "Normale"

msgctxt "Enemies"
msgid "Normal amount of enemies. Recommended for a normal crew."
Expand Down Expand Up @@ -119,7 +119,7 @@ msgstr "Durée"

msgctxt "setting"
msgid "Sets up how much time the players have for the scenario"
msgstr "Définit le temps dont disposent les joueurs pour le scénario."
msgstr "Définit le temps dont disposent les joueurs."

msgctxt "Time"
msgid "Unlimited"
Expand Down
21 changes: 18 additions & 3 deletions scripts/locale/scenario_03_waves.fr.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.4.3\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Poedit 3.2.2\n"
"X-Poedit-Basepath: .\n"
"X-Poedit-SourceCharset: UTF-8\n"

msgid "Waves"
msgstr "Vagues"

# Scenario description
msgid ""
"Waves of increasingly difficult enemies attack friendly stations. There is "
Expand All @@ -41,32 +43,40 @@ msgstr ""
"https://discord.gg/GjqM9Y9yBe\n"
"- Traduction FR : Muerte\n"
"https://discord.gg/2NPKyMnGwp"

# Scenario setting
msgctxt "setting"
msgid "Enemies"
msgstr "Ennemis"
msgstr "Puissance ennemie"

msgctxt "setting"
msgid "Configures the amount of enemies spawned in the scenario."
msgstr "Définit le nombre d'ennemis générés dans le scénario."

msgctxt "Enemies"
msgid "Easy"
msgstr "Facile"

msgctxt "Enemies"
msgid ""
"Decreases the number of ships in each wave. Good for new players, but takes "
"longer for the players to be overwhelmed."
msgstr ""
"Diminue le nombre de vaisseaux à chaque vague. Moins difficile mais plus "
"long. Idéal pour les nouveaux joueurs."

msgctxt "Enemies"
msgid "Normal"
msgstr "Normal"
msgstr "Normale"

msgctxt "Enemies"
msgid "Normal amount of enemies. Recommended for a normal crew."
msgstr "Quantité d'ennemis par défaut. Recommandé pour un équipage standard."

msgctxt "Enemies"
msgid "Hard"
msgstr "Difficile"

msgctxt "Enemies"
msgid ""
"Difficulty starts at wave 5 and increases by 1.5 after the players defeat "
Expand All @@ -75,6 +85,7 @@ msgstr ""
"La difficulté commence à la vague n°5 et augmente de 1,5 après chaque "
"succès. Les joueurs sont submergés plus rapidement, ce qui conduit à des "
"parties plus courtes."

#: scripts/scenario_03_waves.lua:45
msgctxt "goal-shipLog"
msgid ""
Expand All @@ -89,20 +100,24 @@ msgstr ""
"Détruisez tous les vaisseaux ennemis. Après un court laps de temps, la "
"prochaine vague apparaîtra. Et ainsi de suite…\n"
"Combien de vagues serez-vous en mesure de détruire ?"

#: scripts/scenario_03_waves.lua:127
#, lua-format
msgctxt "shipLog"
msgid "Wave %d"
msgstr "Vague n° %d"

#: scripts/scenario_03_waves.lua:220
#, lua-format
msgctxt "msgMainscreen"
msgid "Wave %d"
msgstr "Vague n° %d"

#: scripts/scenario_03_waves.lua:253
msgctxt "msgMainscreen"
msgid "Wave cleared!"
msgstr "Vague éliminée !"

#: scripts/scenario_03_waves.lua:254
#, lua-format
msgctxt "shipLog"
Expand Down
4 changes: 2 additions & 2 deletions scripts/locale/scenario_44_outpost.fr.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ msgstr "Ennemis moins nombreux et/ou plus faibles."

msgctxt "Enemies"
msgid "Normal"
msgstr "Normal"
msgstr "Normale"

msgctxt "Enemies"
msgid "Normal number or strength of enemies"
Expand Down Expand Up @@ -146,7 +146,7 @@ msgstr "Les facteurs aléatoires sont plus en votre faveur."

msgctxt "Murphy"
msgid "Normal"
msgstr "Normal"
msgstr "Normale"

msgctxt "Murphy"
msgid "Random factors are normal"
Expand Down
Loading

2 comments on commit f8145cc

@daid-tinyci
Copy link

@daid-tinyci daid-tinyci bot commented on f8145cc Jun 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TinyCI build failure:

[cmake .. -G Ninja -DSERIOUS_PROTON_DIR=../../SeriousProton -DCMAKE_TOOLCHAIN_FILE=../cmake/android.toolchain -DCMAKE_BUILD_TYPE=Release -DANDROID_ABI=arm64-v8a] returned [1]:

  Could not find toolchain file:

  /data/tinyci_build/daid/EmptyEpsilon/cmake/android/sdk/ndk/23.2.8568313/build/cmake/android.toolchain.cmake

Call Stack (most recent call first):

  CMakeLists.txt:6 (project)





CMake Error: CMake was unable to find a build program corresponding to "Ninja".  CMAKE_MAKE_PROGRAM is not set.  You probably need to select a different build tool.

CMake Error: CMAKE_C_COMPILER not set, after EnableLanguage

CMake Error: CMAKE_CXX_COMPILER not set, after EnableLanguage

-- Configuring incomplete, errors occurred!

No such file or directory

CMake Error: Generator: execution of make failed. Make command was: "" "install"

CMake Error at cmake/android.toolchain:193 (include):

  include could not find load file:



    /data/tinyci_build/daid/EmptyEpsilon/cmake/android/sdk/ndk/23.2.8568313/build/cmake/android.toolchain.cmake

Call Stack (most recent call first):

  _build_android64/CMakeFiles/3.13.4/CMakeSystem.cmake:6 (include)

  CMakeLists.txt:36 (project)





-- The CXX compiler identification is GNU 8.3.0

-- The C compiler identification is GNU 8.3.0

-- Check for working CXX compiler: /usr/bin/c++

Warning: Failed to read or create install properties file.

CMake Error at /data/tinyci_build/daid/EmptyEpsilon/cmake/android.toolchain:40 (message):

  Failed to execute:

  COMMAND;/data/tinyci_build/daid/EmptyEpsilon/cmake/android/sdk/cmdline-tools/bin/sdkmanager;--sdk_root=/data/tinyci_build/daid/EmptyEpsilon/cmake/android/sdk;ndk\;23.2.8568313

Call Stack (most recent call first):

  /data/tinyci_build/daid/EmptyEpsilon/cmake/android.toolchain:66 (execute_process_ex)

  /data/tinyci_build/daid/EmptyEpsilon/_build_android64/CMakeFiles/3.13.4/CMakeSystem.cmake:6 (include)

  /data/tinyci_build/daid/EmptyEpsilon/_build_android64/CMakeFiles/CMakeTmp/CMakeLists.txt:3 (project)





CMake Error: CMAKE_CXX_COMPILER not set, after EnableLanguage

CMake Error at /usr/share/cmake-3.13/Modules/CMakeTestCXXCompiler.cmake:30 (try_compile):

  Failed to configure test project build system.

Call Stack (most recent call first):

  CMakeLists.txt:36 (project)





Loading package information...                                                  
Loading local repository...                                                     
[                                       ] 3% Loading local repository...        
[                                       ] 3% Fetch remote repository...         
[=                                      ] 3% Fetch remote repository...         
[=                                      ] 4% Fetch remote repository...         
[=                                      ] 5% Fetch remote repository...         
[==                                     ] 5% Fetch remote repository...         
[==                                     ] 6% Fetch remote repository...         
[==                                     ] 7% Fetch remote repository...         
[==                                     ] 7% Computing updates...               
[===                                    ] 8% Computing updates...               
[===                                    ] 10% Computing updates...              
[===                                    ] 10% Installing NDK (Side by side) 23.2
                                                                                
[===                                    ] 10% Installing NDK (Side by side) 23.2
-- Configuring incomplete, errors occurred!

See also "/data/tinyci_build/daid/EmptyEpsilon/_build_android64/CMakeFiles/CMakeOutput.log".

@daid-tinyci
Copy link

@daid-tinyci daid-tinyci bot commented on f8145cc Jun 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TinyCI build failure:

[cmake .. -G Ninja -DSERIOUS_PROTON_DIR=../../SeriousProton -DCMAKE_TOOLCHAIN_FILE=../cmake/mingw.toolchain -DCMAKE_BUILD_TYPE=RelWithDebInfo] returned [1]:


-- The C compiler identification is unknown

CMake Error at CMakeLists.txt:36 (project):

  The CMAKE_CXX_COMPILER:



    i686-w64-mingw32-g++-posix



  is not a full path and was not found in the PATH.



  Tell CMake where to find the compiler by setting either the environment

  variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path

  to the compiler, or to the compiler name if it is in the PATH.





CMake Error at CMakeLists.txt:36 (project):

  The CMAKE_C_COMPILER:



    i686-w64-mingw32-gcc-posix



  is not a full path and was not found in the PATH.



  Tell CMake where to find the compiler by setting either the environment

  variable "CC" or the CMake cache entry CMAKE_C_COMPILER to the full path to

  the compiler, or to the compiler name if it is in the PATH.





-- Configuring incomplete, errors occurred!

See also "/data/tinyci_build/daid/EmptyEpsilon/_build_win32/CMakeFiles/CMakeOutput.log".

See also "/data/tinyci_build/daid/EmptyEpsilon/_build_win32/CMakeFiles/CMakeError.log".

Please sign in to comment.