Compare commits

...

10 Commits

Author SHA1 Message Date
Jottyfan
2417351ba7 update 2025-09-13 15:30:55 +02:00
829b527844 Merge branch 'StringFixModern' into 'master'
Updating Language Files to modern Standards to fix display issue.

See merge request jottyfan/bee-reward!3
2024-01-03 14:05:38 +00:00
Toby Lawrance
e1825615a8 Updating Language Files to modern Standards to fix display issue. 2024-01-03 14:05:37 +00:00
5f69624c4d makefile 2020-05-27 01:30:22 +02:00
c93f2380c9 Merge branch '1-use-different-cost-category' into 'master'
Resolve "Use different cost category?"

Closes #1

See merge request jottyfan/bee-reward!2
2020-05-26 22:21:53 +00:00
59dea385da bugfix 2020-05-27 00:21:15 +02:00
451ba978fb fixes https://gitlab.com/jottyfan/bee-reward/-/issues/1 2020-05-27 00:15:01 +02:00
7453cf6801 Merge branch '2-bee-rewards-doesn-t-store-best-score-on-selecting-the-best-goal' into 'master'
Resolve "bee rewards doesn't store best score on selecting the best goal"

Closes #2

See merge request jottyfan/bee-reward!1
2020-05-26 21:53:03 +00:00
2238c7e8d1 fixes https://gitlab.com/jottyfan/bee-reward/-/issues/2 2020-05-26 23:51:04 +02:00
ce08fb9847 removing mercurial files 2020-05-26 23:30:43 +02:00
26 changed files with 113 additions and 243 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
bundle/*

View File

@@ -1,3 +0,0 @@
syntax: glob
install.sh
bundle/**

View File

@@ -24,12 +24,13 @@ BANANAS_INI = bananas.ini
MUSA = musa.py MUSA = musa.py
VERSION_INFO := "$(shell ./findversion.sh)" VERSION_INFO := $(shell ./findversion.sh)
REPO_VERSION := $(shell echo ${VERSION_INFO} | cut -f2) VERSION_NUMBER := $(shell echo "$(VERSION_INFO)" | sed 's/v//g')
REPO_TAG := $(shell echo ${VERSION_INFO} | cut -f5) REPO_VERSION := $(shell git rev-parse HEAD)
REPO_DATE := $(shell echo ${VERSION_INFO} | cut -f7) REPO_TAG := $(VERSION_INFO)
REPO_DATE := $(shell date +%Y-%m-%d)
DISPLAY_NAME := $(PROJECT_NAME) $(REPO_TAG) DISPLAY_NAME := $(PROJECT_NAME) $(VERSION_INFO)
BUNDLE_NAME := $(PROJECT_NAME) BUNDLE_NAME := $(PROJECT_NAME)
BUNDLE_FILENAME = $(shell echo "$(DISPLAY_NAME)" | sed 's/ /-/g') BUNDLE_FILENAME = $(shell echo "$(DISPLAY_NAME)" | sed 's/ /-/g')
@@ -47,12 +48,12 @@ bundle: $(BUNDLE_DIR)/$(BUNDLE_FILENAME).tar
$(BUNDLE_DIR)/$(BUNDLE_FILENAME).tar: $(SOURCES) $(LANGFILES) $(DOCS) $(BUNDLE_DIR)/$(BUNDLE_FILENAME).tar: $(SOURCES) $(LANGFILES) $(DOCS)
echo "[Bundle] $@" echo "[Bundle] $@"
python3 check_lang_compatibility.py lang/english.txt info.nut # python3 check_lang_compatibility.py lang/english.txt info.nut
rm -rf "$(BUNDLE_DIR)" rm -rf "$(BUNDLE_DIR)"
mkdir -p "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)/lang" mkdir -p "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)/lang"
cp $(SOURCES) $(DOCS) "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)" cp $(SOURCES) $(DOCS) "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)"
cp $(LANGFILES) "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)/lang" cp $(LANGFILES) "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)/lang"
sed -e 's/^PROGRAM_VERSION.*/PROGRAM_VERSION <- $(REPO_VERSION);/' \ sed -e 's/^PROGRAM_VERSION.*/PROGRAM_VERSION <- $(VERSION_NUMBER);/' \
-e 's/^PROGRAM_DATE.*/PROGRAM_DATE <- "$(REPO_DATE)";/' \ -e 's/^PROGRAM_DATE.*/PROGRAM_DATE <- "$(REPO_DATE)";/' \
-e 's/^PROGRAM_NAME.*/PROGRAM_NAME <- "$(DISPLAY_NAME)";/' < info.nut > "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)/info.nut" -e 's/^PROGRAM_NAME.*/PROGRAM_NAME <- "$(DISPLAY_NAME)";/' < info.nut > "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)/info.nut"
cd $(BUNDLE_DIR); tar -cf "$(BUNDLE_FILENAME).tar" "$(BUNDLE_FILENAME)" cd $(BUNDLE_DIR); tar -cf "$(BUNDLE_FILENAME).tar" "$(BUNDLE_FILENAME)"

View File

@@ -2,11 +2,10 @@
type = Game Script type = Game Script
name = BeeReward name = BeeReward
# The version is inserted by the Makefile version = v7
version =
description_file = bananas_description.txt description_file = bananas_description.txt
url = http://dev.openttdcoop.org/projects/bee-awards url = https://gitlab.com/jottyfan/bee-reward/
license = GPL v2 license = GPL v2
tags = cargo, challenge, goal, cooperative, reward tags = cargo, challenge, goal, cooperative, reward
openttd_minimum_supported_version = 1.4.2 openttd_minimum_supported_version = 1.4.2

0
check_lang_compatibility.py Executable file → Normal file
View File

View File

@@ -181,8 +181,8 @@ function CompanyGoal::UpdateDelivered(mon, comp_id)
} }
local goal_won_news; local goal_won_news;
if (this.reward > 0) { if (this.reward > 0) {
GSCompany.ChangeBankBalance(comp_id, this.reward, 0); GSCompany.ChangeBankBalance(comp_id, this.reward, GSCompany.EXPENSES_OTHER);
goal_won_news = GSText(GSText.STR_COMPANY_GOAL_REWARD_WON_NEWS, cargo.cid, this.wanted_amount, destination_string_news, this.reward); // goal_won_news = GSText(GSText.STR_COMPANY_GOAL_REWARD_WON_NEWS, cargo.cid, this.wanted_amount, destination_string_news, this.reward);
} else { } else {
goal_won_news = GSText(GSText.STR_COMPANY_GOAL_WON_NEWS, cargo.cid, this.wanted_amount, destination_string_news); goal_won_news = GSText(GSText.STR_COMPANY_GOAL_WON_NEWS, cargo.cid, this.wanted_amount, destination_string_news);
} }

View File

@@ -1,131 +1,3 @@
# make-nml NewGRF build framework #!/bin/bash
# (c) 2014 planetmaker and others
# Contact: planetmaker@openttd.org
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This file is derived from OpenTTD's version check more bananas.ini | grep '^version' | sed "s/^version = //g"
# Arguments given? Show help text.
if [ "$#" != "0" ]; then
cat <<EOF
Usage: ./findversion.sh
Finds the current revision and if the code is modified.
Output: <HASH>\t<VERSION>\t<MODIFIED>\t<TAG>\t<DISPLAY_VERSION>\t<BRANCH>\t<DATE>
HASH
a string unique to the version of the code the current checkout is
based on. The exact format of this string depends on the version
control system in use, but it tries to identify the revision used as
close as possible (using the svn revision number or hg/git hash).
This also includes an indication of whether the checkout was
modified and which branch was checked out. This value is not
guaranteed to be sortable, but is mainly meant for identifying the
revision and user display.
If no revision identifier could be found, this is left empty.
VERSION
the version number to be reported to OpenTTD (aka NewGRF version).
This usually is the number of days passed since 1.1.2000 up to the
date of the last commit in the repository.
This number should be sortable. Within a given branch or trunk, a
higher number means a newer version. However, when using git or hg,
this number will not increase on new commits.
If no revision number could be found, this is left empty.
MODIFIED
Whether (the src directory of) this checkout is modified or not. A
value of 0 means not modified, a value of 2 means it was modified.
Modification is determined in relation to the commit identified by
REV, so not in relation to the svn revision identified by REV_NR.
A value of 1 means that the modified status is unknown, because this
is not an svn/git/hg checkout for example.
TAG
the tag of the commit (if any) - used to indicate and name releases
DISPLAY_VERSION
The version string shown to the user of the NewGRF
BRANCH
The branch the version is based on
DATE
The date of the last commit in ISO format
By setting the AWK environment variable, a caller can determine which
version of "awk" is used. If nothing is set, this script defaults to
"awk".
EOF
exit 1;
fi
# Allow awk to be provided by the caller.
if [ -z "$AWK" ]; then
AWK=awk
fi
# Find out some dirs
cd `dirname "$0"`
ROOT_DIR=`pwd`
# Determine if we are using a modified version
# Assume the dir is not modified
MODIFIED=""
REPO_DATE="2000,1,1"
if [ -d "$ROOT_DIR/.hg" ]; then
# We are a hg checkout
if [ -n "`HGPLAIN= hg status -S | grep -v '^?'`" ]; then
MODIFIED="M"
fi
HASH=`LC_ALL=C HGPLAIN= hg id -i | cut -c1-12`
REV="h`echo $HASH | cut -c1-8`"
BRANCH="`hg branch | sed 's@^default$@@'`"
TAG="`HGPLAIN= hg id -t | grep -v 'tip$'`"
ISO_DATE="`HGPLAIN= hg log -r$HASH --template=\"{date|shortdate}\"`"
REPO_DATE="`echo ${ISO_DATE} | sed s/-/,/g | sed s/,0/,/g`"
VERSION=`python -c "from datetime import date; print (date($REPO_DATE)-date(2000,1,1)).days"`
DISPLAY_VERSION="v${VERSION}"
if [ -n "$TAG" ]; then
BRANCH=""
DISPLAY_VERSION="${TAG}"
fi
elif [ -f "$ROOT_DIR/.rev" ]; then
# We are an exported source bundle
cat $ROOT_DIR/.rev
exit
else
# We don't know
HASH=""
VERSION="0"
MODIFIED=""
BRANCH=""
TAG=""
DISPLAY_VERSION="noRev"
ISO_DATE=""
fi
DISPLAY_VERSION="${DISPLAY_VERSION}${MODIFIED}"
if [ -n "$BRANCH" ]; then
DISPLAY_VERSION="$BRANCH-${DISPLAY_VERSION}"
fi
if [ -z "${TAG}" -a -n "${HASH}" ]; then
DISPLAY_VERSION="${DISPLAY_VERSION}-h${HASH}"
fi
echo "$HASH $VERSION $MODIFIED $TAG $DISPLAY_VERSION $BRANCH $ISO_DATE"

View File

@@ -33,7 +33,7 @@ class BeeRewardInfo extends GSInfo {
function CreateInstance() { return "BeeRewardClass"; } function CreateInstance() { return "BeeRewardClass"; }
function GetShortName() { return "BREW"; } function GetShortName() { return "BREW"; }
function GetAPIVersion() { return "1.5"; } function GetAPIVersion() { return "1.5"; }
function GetUrl() { return "http://dev.openttdcoop.org/projects/bee-awards"; } function GetUrl() { return "https://gitlab.com/jottyfan/bee-reward/"; }
function MinVersionToLoad() { return MINCOMPATIBLE_SAVEGAME_VERSION; } function MinVersionToLoad() { return MINCOMPATIBLE_SAVEGAME_VERSION; }
function GetSettings(); function GetSettings();
} }

View File

@@ -1,12 +1,12 @@
##plural 0 ##plural 0
STR_COMPANY_GOAL_REWARD :Lewer {GOLD}{CARGO_LONG} {ORANGE} aan {STRING}{ORANGE} vir {WHITE}{STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD :Lewer {GOLD}{CARGO_LONG} {ORANGE} aan {STRING1}{ORANGE} vir {WHITE}{CURRENCY_LONG}
STR_COMPANY_GOAL :Lewer {GOLD}{CARGO_LONG} {ORANGE}aan {STRING} STR_COMPANY_GOAL :Lewer {GOLD}{CARGO_LONG} {ORANGE}aan {STRING1}
STR_COMPANY_GOAL_REWARD_NEWS :Nuwe Doel! Lewer {CARGO_LONG} aan {STRING} vir {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_NEWS :Nuwe Doel! Lewer {CARGO_LONG} aan {STRING1} vir {CURRENCY_LONG}
STR_COMPANY_GOAL_NEWS :Nuwe doel! Lewer {CARGO_LONG} by {STRING} af STR_COMPANY_GOAL_NEWS :Nuwe doel! Lewer {CARGO_LONG} by {STRING1} af
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}gedoen STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}gedoen
STR_COMPANY_GOAL_REWARD_WON_NEWS :Doel gewen! {CARGO_LONG} afgelewer by {STRING} en verdien {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_WON_NEWS :Doel gewen! {CARGO_LONG} afgelewer by {STRING1} en verdien {CURRENCY_LONG}
STR_COMPANY_GOAL_WON_NEWS :Doel bereik! {CARGO_LONG} afgelewer by {STRING} STR_COMPANY_GOAL_WON_NEWS :Doel bereik! {CARGO_LONG} afgelewer by {STRING1}
STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}jaar{P "" ""} oorblywend STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}jaar{P "" ""} oorblywend
STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}maand{P "" e} oorblywend STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}maand{P "" e} oorblywend
STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}da{P g e} oorblywend STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}da{P g e} oorblywend

View File

@@ -1,12 +1,12 @@
##plural 0 ##plural 0
STR_COMPANY_GOAL_REWARD :Envia {GOLD}{CARGO_LONG} {ORANGE}a {STRING}{ORANGE} per {WHITE}{STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD :Envia {GOLD}{CARGO_LONG} {ORANGE}a {STRING1}{ORANGE} per {WHITE}{CURRENCY_LONG}
STR_COMPANY_GOAL :Envia {GOLD}{CARGO_LONG} {ORANGE}a {STRING} STR_COMPANY_GOAL :Envia {GOLD}{CARGO_LONG} {ORANGE}a {STRING1}
STR_COMPANY_GOAL_REWARD_NEWS :Nou objectiu! Envia {CARGO_LONG} a {STRING} per {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_NEWS :Nou objectiu! Envia {CARGO_LONG} a {STRING1} per {CURRENCY_LONG}
STR_COMPANY_GOAL_NEWS :Nou objectiu! Envia {CARGO_LONG} a {STRING} STR_COMPANY_GOAL_NEWS :Nou objectiu! Envia {CARGO_LONG} a {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}fet STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}fet
STR_COMPANY_GOAL_REWARD_WON_NEWS :Objectiu aconseguit! {CARGO_LONG} enviats/des a {STRING} per {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_WON_NEWS :Objectiu aconseguit! {CARGO_LONG} enviats/des a {STRING1} per {CURRENCY_LONG}
STR_COMPANY_GOAL_WON_NEWS :Objectiu aconseguit! {CARGO_LONG} enviats/des {STRING} STR_COMPANY_GOAL_WON_NEWS :Objectiu aconseguit! {CARGO_LONG} enviats/des {STRING1}
STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}any{P "" s} restant{P "" s} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}any{P "" s} restant{P "" s}
STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mes{P "" os} restant{P "" s} STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mes{P "" os} restant{P "" s}
STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}di{P a es} restant{P "" s} STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}di{P a es} restant{P "" s}

View File

@@ -1,12 +1,12 @@
##plural 6 ##plural 6
STR_COMPANY_GOAL_REWARD :Dostavite{GOLD}{CARGO_LONG} {ORANGE}do {STRING}{ORANGE} za {WHITE}{STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD :Dostavite{GOLD}{CARGO_LONG} {ORANGE}do {STRING1}{ORANGE} za {WHITE}{CURRENCY_LONG}
STR_COMPANY_GOAL :Dostavite {GOLD}{CARGO_LONG} {ORANGE}do {STRING} STR_COMPANY_GOAL :Dostavite {GOLD}{CARGO_LONG} {ORANGE}do {STRING1}
STR_COMPANY_GOAL_REWARD_NEWS :Novi cilj! Dostavite {CARGO_LONG} do {STRING} za {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_NEWS :Novi cilj! Dostavite {CARGO_LONG} do {STRING1} za {CURRENCY_LONG}
STR_COMPANY_GOAL_NEWS :Novi cilj! Dostavite {CARGO_LONG} do {STRING} STR_COMPANY_GOAL_NEWS :Novi cilj! Dostavite {CARGO_LONG} do {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}završeno STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}završeno
STR_COMPANY_GOAL_REWARD_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno do {STRING} i osvojeno {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno do {STRING1} i osvojeno {CURRENCY_LONG}
STR_COMPANY_GOAL_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno do {STRING} STR_COMPANY_GOAL_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno do {STRING1}
STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}godin{P a e e} ostaje STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}godin{P a e e} ostaje
STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mjesec{P "" a i} ostaje STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mjesec{P "" a i} ostaje
STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dan{P "" a a} ostaje STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dan{P "" a a} ostaje

View File

@@ -1,12 +1,12 @@
##plural 10 ##plural 10
STR_COMPANY_GOAL_REWARD :Doruč {GOLD}{CARGO_LONG} {ORANGE}do {STRING}{ORANGE} za {WHITE}{STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD :Doruč {GOLD}{CARGO_LONG} {ORANGE}do {STRING1}{ORANGE} za {WHITE}{CURRENCY_LONG}
STR_COMPANY_GOAL :Doruč {GOLD}{CARGO_LONG} {ORANGE}do {STRING} STR_COMPANY_GOAL :Doruč {GOLD}{CARGO_LONG} {ORANGE}do {STRING1}
STR_COMPANY_GOAL_REWARD_NEWS :Nový cíl! Doruč {CARGO_LONG} do {STRING} za {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_NEWS :Nový cíl! Doruč {CARGO_LONG} do {STRING1} za {CURRENCY_LONG}
STR_COMPANY_GOAL_NEWS :Nový cíl! Doruč {CARGO_LONG} do {STRING} STR_COMPANY_GOAL_NEWS :Nový cíl! Doruč {CARGO_LONG} do {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}hotovo STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}hotovo
STR_COMPANY_GOAL_REWARD_WON_NEWS :Cíl splněn! {CARGO_LONG} doručeno do {STRING} a získáno {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_WON_NEWS :Cíl splněn! {CARGO_LONG} doručeno do {STRING1} a získáno {CURRENCY_LONG}
STR_COMPANY_GOAL_WON_NEWS :Cíl splněn! {CARGO_LONG} doručeno do {STRING} STR_COMPANY_GOAL_WON_NEWS :Cíl splněn! {CARGO_LONG} doručeno do {STRING1}
STR_TIMEOUT_YEARS :Zbývá {GOLD}{NUM} {ORANGE}rok{P "" "y" "ů"} STR_TIMEOUT_YEARS :Zbývá {GOLD}{NUM} {ORANGE}rok{P "" "y" "ů"}
STR_TIMEOUT_MONTHS :Zbývá {GOLD}{NUM} {ORANGE}měsíc{P "" "e" "ů"} STR_TIMEOUT_MONTHS :Zbývá {GOLD}{NUM} {ORANGE}měsíc{P "" "e" "ů"}
STR_TIMEOUT_DAYS :Zbývá {GOLD}{NUM} {ORANGE}d{P "en" "ny" "nů"} STR_TIMEOUT_DAYS :Zbývá {GOLD}{NUM} {ORANGE}d{P "en" "ny" "nů"}

View File

@@ -1,12 +1,12 @@
##plural 0 ##plural 0
STR_COMPANY_GOAL_REWARD :Lever {GOLD}{CARGO_LONG} {ORANGE}aan {STRING}{ORANGE} voor {WHITE}{STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD :Lever {GOLD}{CARGO_LONG} {ORANGE}aan {STRING1}{ORANGE} voor {WHITE}{CURRENCY_LONG}
STR_COMPANY_GOAL :Lever {GOLD}{CARGO_LONG} {ORANGE}aan {STRING} STR_COMPANY_GOAL :Lever {GOLD}{CARGO_LONG} {ORANGE}aan {STRING1}
STR_COMPANY_GOAL_REWARD_NEWS :Nieuw doel! lever {CARGO_LONG} aan {STRING} voor {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_NEWS :Nieuw doel! lever {CARGO_LONG} aan {STRING1} voor {CURRENCY_LONG}
STR_COMPANY_GOAL_NEWS :Nieuw doel! Lever {CARGO_LONG} aan {STRING} STR_COMPANY_GOAL_NEWS :Nieuw doel! Lever {CARGO_LONG} aan {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}gereed STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}gereed
STR_COMPANY_GOAL_REWARD_WON_NEWS :Doel behaald! {CARGO_LONG} geleverd aan {STRING} en {STRING}{CURRENCY_LONG} verdiend STR_COMPANY_GOAL_REWARD_WON_NEWS :Doel behaald! {CARGO_LONG} geleverd aan {STRING1} en {CURRENCY_LONG} verdiend
STR_COMPANY_GOAL_WON_NEWS :Doel behaald! {CARGO_LONG} geleverd aan {STRING} STR_COMPANY_GOAL_WON_NEWS :Doel behaald! {CARGO_LONG} geleverd aan {STRING1}
STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}jaar resterend STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}jaar resterend
STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}maand{P "" en} resterend STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}maand{P "" en} resterend
STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dag{P "" en} resterend STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dag{P "" en} resterend

View File

@@ -1,12 +1,12 @@
##plural 0 ##plural 0
STR_COMPANY_GOAL_REWARD :Deliver {GOLD}{CARGO_LONG} {ORANGE}to {STRING}{ORANGE} for {WHITE}{STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD :Deliver {GOLD}{CARGO_LONG} {ORANGE}to {STRING1}{ORANGE} for {WHITE}{CURRENCY_LONG}
STR_COMPANY_GOAL :Deliver {GOLD}{CARGO_LONG} {ORANGE}to {STRING} STR_COMPANY_GOAL :Deliver {GOLD}{CARGO_LONG} {ORANGE}to {STRING1}
STR_COMPANY_GOAL_REWARD_NEWS :New goal! Deliver {CARGO_LONG} to {STRING} for {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_NEWS :New goal! Deliver {CARGO_LONG} to {STRING1} for {CURRENCY_LONG}
STR_COMPANY_GOAL_NEWS :New goal! Deliver {CARGO_LONG} to {STRING} STR_COMPANY_GOAL_NEWS :New goal! Deliver {CARGO_LONG} to {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}done STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}done
STR_COMPANY_GOAL_REWARD_WON_NEWS :Goal won! {CARGO_LONG} delivered to {STRING} and earned {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_WON_NEWS :Goal won! {CARGO_LONG} delivered to {STRING1} and earned {CURRENCY_LONG}
STR_COMPANY_GOAL_WON_NEWS :Goal won! {CARGO_LONG} delivered to {STRING} STR_COMPANY_GOAL_WON_NEWS :Goal won! {CARGO_LONG} delivered to {STRING1}
STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}year{P "" s} remaining STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}year{P "" s} remaining
STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}month{P "" s} remaining STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}month{P "" s} remaining
STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}day{P "" s} remaining STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}day{P "" s} remaining

View File

@@ -1,12 +1,12 @@
##plural 2 ##plural 2
STR_COMPANY_GOAL_REWARD :Livrer {GOLD}{CARGO_LONG} {ORANGE} à {STRING}{ORANGE} pour une récompense de {WHITE}{STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD :Livrer {GOLD}{CARGO_LONG} {ORANGE} à {STRING1}{ORANGE} pour une récompense de {WHITE}{CURRENCY_LONG}
STR_COMPANY_GOAL :Livrer {GOLD}{CARGO_LONG} {ORANGE}à {STRING} STR_COMPANY_GOAL :Livrer {GOLD}{CARGO_LONG} {ORANGE}à {STRING1}
STR_COMPANY_GOAL_REWARD_NEWS :Nouvelle mission{NBSP}! Livrer {CARGO_LONG} à {STRING} pour une récompense de {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_NEWS :Nouvelle mission{NBSP}! Livrer {CARGO_LONG} à {STRING1} pour une récompense de {CURRENCY_LONG}
STR_COMPANY_GOAL_NEWS :Nouvelle mission{NBSP}! Livrer {CARGO_LONG} à {STRING} STR_COMPANY_GOAL_NEWS :Nouvelle mission{NBSP}! Livrer {CARGO_LONG} à {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}effectué STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}effectué
STR_COMPANY_GOAL_REWARD_WON_NEWS :But atteint{NBSP}! {CARGO_LONG} ont atteint {STRING}{NBSP}: {STRING}{CURRENCY_LONG} de récompense{NBSP}! STR_COMPANY_GOAL_REWARD_WON_NEWS :But atteint{NBSP}! {CARGO_LONG} ont atteint {STRING1}{NBSP}: {CURRENCY_LONG} de récompense{NBSP}!
STR_COMPANY_GOAL_WON_NEWS :But atteint{NBSP}! {CARGO_LONG} ont atteint {STRING} STR_COMPANY_GOAL_WON_NEWS :But atteint{NBSP}! {CARGO_LONG} ont atteint {STRING1}
STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}an{P "" s} restant{P "" s} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}an{P "" s} restant{P "" s}
STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mois restant{P "" s} STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mois restant{P "" s}
STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}jour{P "" s} restant{P "" s} STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}jour{P "" s} restant{P "" s}

View File

@@ -1,12 +1,12 @@
##plural 0 ##plural 0
STR_COMPANY_GOAL_REWARD :Lieferung von {GOLD}{CARGO_LONG} {ORANGE}nach {STRING}{ORANGE} bringt {WHITE}{STRING}{CURRENCY_LONG} {ORANGE}ein STR_COMPANY_GOAL_REWARD :Lieferung von {GOLD}{CARGO_LONG} {ORANGE}nach {STRING1}{ORANGE} bringt {WHITE}{CURRENCY_LONG} {ORANGE}ein
STR_COMPANY_GOAL :Liefere {GOLD}{CARGO_LONG} {ORANGE}nach {STRING} STR_COMPANY_GOAL :Liefere {GOLD}{CARGO_LONG} {ORANGE}nach {STRING1}
STR_COMPANY_GOAL_REWARD_NEWS :Neues Ziel! Liefere {CARGO_LONG} nach {STRING} für {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_NEWS :Neues Ziel! Liefere {CARGO_LONG} nach {STRING1} für {CURRENCY_LONG}
STR_COMPANY_GOAL_NEWS :Neues Ziel! Liefere {CARGO_LONG} nach {STRING} STR_COMPANY_GOAL_NEWS :Neues Ziel! Liefere {CARGO_LONG} nach {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}erreicht STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}erreicht
STR_COMPANY_GOAL_REWARD_WON_NEWS :Ziel erreicht! {CARGO_LONG} nach {STRING} geliefert und {STRING}{CURRENCY_LONG} kassiert STR_COMPANY_GOAL_REWARD_WON_NEWS :Ziel erreicht! {CARGO_LONG} nach {STRING1} geliefert und {CURRENCY_LONG} kassiert
STR_COMPANY_GOAL_WON_NEWS :Ziel erreicht! {CARGO_LONG} nach {STRING} geliefert STR_COMPANY_GOAL_WON_NEWS :Ziel erreicht! {CARGO_LONG} nach {STRING1} geliefert
STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}Jahr{P "" e} verbleib{P t en} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}Jahr{P "" e} verbleib{P t en}
STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}Monat{P "" e} verbleib{P t en} STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}Monat{P "" e} verbleib{P t en}
STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}Tag{P "" e} verbleib{P t en} STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}Tag{P "" e} verbleib{P t en}

View File

@@ -1,12 +1,12 @@
##plural 1 ##plural 1
STR_COMPANY_GOAL_REWARD :Antarkan {GOLD}{CARGO_LONG} {ORANGE}ke {STRING}{ORANGE} untuk {WHITE}{STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD :Antarkan {GOLD}{CARGO_LONG} {ORANGE}ke {STRING1}{ORANGE} untuk {WHITE}{CURRENCY_LONG}
STR_COMPANY_GOAL :Antarkan {GOLD}{CARGO_LONG} {ORANGE}ke {STRING} STR_COMPANY_GOAL :Antarkan {GOLD}{CARGO_LONG} {ORANGE}ke {STRING1}
STR_COMPANY_GOAL_REWARD_NEWS :Target baru! Antarkan {CARGO_LONG} ke {STRING} untuk {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_NEWS :Target baru! Antarkan {CARGO_LONG} ke {STRING1} untuk {CURRENCY_LONG}
STR_COMPANY_GOAL_NEWS :Target baru! Antarkan {CARGO_LONG} ke {STRING} STR_COMPANY_GOAL_NEWS :Target baru! Antarkan {CARGO_LONG} ke {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}selesai STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}selesai
STR_COMPANY_GOAL_REWARD_WON_NEWS :Target tercapai! {CARGO_LONG} diantarkan ke {STRING} dan beruntung {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_WON_NEWS :Target tercapai! {CARGO_LONG} diantarkan ke {STRING1} dan beruntung {CURRENCY_LONG}
STR_COMPANY_GOAL_WON_NEWS :Target tercapai! {CARGO_LONG} diantarkan ke {STRING} STR_COMPANY_GOAL_WON_NEWS :Target tercapai! {CARGO_LONG} diantarkan ke {STRING1}
STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}tahun tersisa STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}tahun tersisa
STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}bulan tersisa STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}bulan tersisa
STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}hari tersisa STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}hari tersisa

View File

@@ -1,12 +1,12 @@
##plural 0 ##plural 0
STR_COMPANY_GOAL_REWARD :Consegnare {GOLD}{CARGO_LONG} {ORANGE}a {STRING}{ORANGE} per {WHITE}{STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD :Consegnare {GOLD}{CARGO_LONG} {ORANGE}a {STRING1}{ORANGE} per {WHITE}{CURRENCY_LONG}
STR_COMPANY_GOAL :Consegnare {GOLD}{CARGO_LONG} {ORANGE}a {STRING} STR_COMPANY_GOAL :Consegnare {GOLD}{CARGO_LONG} {ORANGE}a {STRING1}
STR_COMPANY_GOAL_REWARD_NEWS :Nuovo obiettivo! Consegnare {CARGO_LONG} a {STRING} per {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_NEWS :Nuovo obiettivo! Consegnare {CARGO_LONG} a {STRING1} per {CURRENCY_LONG}
STR_COMPANY_GOAL_NEWS :Nuovo obiettivo! Consegnare {CARGO_LONG} a {STRING} STR_COMPANY_GOAL_NEWS :Nuovo obiettivo! Consegnare {CARGO_LONG} a {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}completato STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}completato
STR_COMPANY_GOAL_REWARD_WON_NEWS :Obiettivo raggiunto! {CARGO_LONG} consegnato a {STRING} e guadagnato {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_WON_NEWS :Obiettivo raggiunto! {CARGO_LONG} consegnato a {STRING1} e guadagnato {CURRENCY_LONG}
STR_COMPANY_GOAL_WON_NEWS :Obiettivo raggiunto! Consegna di {CARGO_LONG} effettuata a {STRING} STR_COMPANY_GOAL_WON_NEWS :Obiettivo raggiunto! Consegna di {CARGO_LONG} effettuata a {STRING1}
STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}ann{P o i} rimanent{P e i} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}ann{P o i} rimanent{P e i}
STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mes{P e i} rimanent{P e i} STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mes{P e i} rimanent{P e i}
STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}giorn{P o i} rimanent{P e i} STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}giorn{P o i} rimanent{P e i}

View File

@@ -1,12 +1,12 @@
##plural 11 ##plural 11
STR_COMPANY_GOAL_REWARD :{GOLD}{CARGO_LONG} {ORANGE}을 {STRING}{ORANGE} 으로 수송하여 {WHITE}{STRING}{CURRENCY_LONG}의 보상을 받으세요 STR_COMPANY_GOAL_REWARD :{GOLD}{CARGO_LONG} {ORANGE}을 {STRING1}{ORANGE} 으로 수송하여 {WHITE}{CURRENCY_LONG}의 보상을 받으세요
STR_COMPANY_GOAL : {GOLD}{CARGO_LONG}을 {ORANGE} {STRING}까지 수송하세요 STR_COMPANY_GOAL : {GOLD}{CARGO_LONG}을 {ORANGE} {STRING1}까지 수송하세요
STR_COMPANY_GOAL_REWARD_NEWS :새 목표! {CARGO_LONG}을 {STRING}으로 수송하여 {STRING}{CURRENCY_LONG}만큼의 보상을 받으세요 STR_COMPANY_GOAL_REWARD_NEWS :새 목표! {CARGO_LONG}을 {STRING1}으로 수송하여 {CURRENCY_LONG}만큼의 보상을 받으세요
STR_COMPANY_GOAL_NEWS :새로운 목표! {CARGO_LONG}을 {STRING}로 수송하세요 STR_COMPANY_GOAL_NEWS :새로운 목표! {CARGO_LONG}을 {STRING1}로 수송하세요
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}완료됨 STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}완료됨
STR_COMPANY_GOAL_REWARD_WON_NEWS :목표 달성! {CARGO_LONG}이 {STRING}으로 수송되어 {STRING}{CURRENCY_LONG}을 얻었습니다! STR_COMPANY_GOAL_REWARD_WON_NEWS :목표 달성! {CARGO_LONG}이 {STRING1}으로 수송되어 {CURRENCY_LONG}을 얻었습니다!
STR_COMPANY_GOAL_WON_NEWS :목표 달성! {CARGO_LONG} 만큼 {STRING}으로 수송됨 STR_COMPANY_GOAL_WON_NEWS :목표 달성! {CARGO_LONG} 만큼 {STRING1}으로 수송됨
STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}년 남음 STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}년 남음
STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}달 남음 STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}달 남음
STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}일 남음 STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}일 남음

View File

@@ -1,12 +1,12 @@
##plural 0 ##plural 0
STR_COMPANY_GOAL_REWARD :Trade {GOLD}{CARGO_LONG} {ORANGE}ad {STRING}{ORANGE} ut accipias {WHITE}{STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD :Trade {GOLD}{CARGO_LONG} {ORANGE}ad {STRING1}{ORANGE} ut accipias {WHITE}{CURRENCY_LONG}
STR_COMPANY_GOAL :Trade {GOLD}{CARGO_LONG} {ORANGE}ad {STRING} STR_COMPANY_GOAL :Trade {GOLD}{CARGO_LONG} {ORANGE}ad {STRING1}
STR_COMPANY_GOAL_REWARD_NEWS :Nova meta! Trade {CARGO_LONG} ad {STRING} ut accipias {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_NEWS :Nova meta! Trade {CARGO_LONG} ad {STRING1} ut accipias {CURRENCY_LONG}
STR_COMPANY_GOAL_NEWS :Meta nova! Trade {CARGO_LONG} ad {STRING} STR_COMPANY_GOAL_NEWS :Meta nova! Trade {CARGO_LONG} ad {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}tradita STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}tradita
STR_COMPANY_GOAL_REWARD_WON_NEWS :Meta perfecta! {CARGO_LONG} tradita ad {STRING} et lucraris {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_WON_NEWS :Meta perfecta! {CARGO_LONG} tradita ad {STRING1} et lucraris {CURRENCY_LONG}
STR_COMPANY_GOAL_WON_NEWS :Vicisti! {CARGO_LONG} tradita est ad {STRING} STR_COMPANY_GOAL_WON_NEWS :Vicisti! {CARGO_LONG} tradita est ad {STRING1}
STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}ann{P us i} reliqu{P us i} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}ann{P us i} reliqu{P us i}
STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mens{P is es} reliqu{P us i} STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mens{P is es} reliqu{P us i}
STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dies reliqu{P us i} STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dies reliqu{P us i}

View File

@@ -1,12 +1,12 @@
##plural 6 ##plural 6
STR_COMPANY_GOAL_REWARD :Доставьте {GOLD}{CARGO_LONG} {ORANGE}в {STRING}{ORANGE} за {WHITE}{STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD :Доставьте {GOLD}{CARGO_LONG} {ORANGE}в {STRING1}{ORANGE} за {WHITE}{CURRENCY_LONG}
STR_COMPANY_GOAL :Доставьте {GOLD}{CARGO_LONG} {ORANGE}в {STRING} STR_COMPANY_GOAL :Доставьте {GOLD}{CARGO_LONG} {ORANGE}в {STRING1}
STR_COMPANY_GOAL_REWARD_NEWS :Новая цель! Доставьте {CARGO_LONG} в {STRING} за {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_NEWS :Новая цель! Доставьте {CARGO_LONG} в {STRING1} за {CURRENCY_LONG}
STR_COMPANY_GOAL_NEWS :Новая цель! Доставьте {CARGO_LONG} в {STRING} STR_COMPANY_GOAL_NEWS :Новая цель! Доставьте {CARGO_LONG} в {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}выполнено STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}выполнено
STR_COMPANY_GOAL_REWARD_WON_NEWS :Цель достигнута! {CARGO_LONG} доставлено в {STRING} и получено {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_WON_NEWS :Цель достигнута! {CARGO_LONG} доставлено в {STRING1} и получено {CURRENCY_LONG}
STR_COMPANY_GOAL_WON_NEWS :Цель достигнута! {CARGO_LONG} доставлено в {STRING} STR_COMPANY_GOAL_WON_NEWS :Цель достигнута! {CARGO_LONG} доставлено в {STRING1}
STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}{P год года лет} осталось STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}{P год года лет} осталось
STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}месяц{P "" а ев} осталось STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}месяц{P "" а ев} осталось
STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}{P день дня дней} осталось STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}{P день дня дней} осталось

View File

@@ -1,12 +1,12 @@
##plural 6 ##plural 6
STR_COMPANY_GOAL_REWARD :Dostavite {GOLD}{CARGO_LONG} {ORANGE}u {STRING}{ORANGE} za {WHITE}{STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD :Dostavite {GOLD}{CARGO_LONG} {ORANGE}u {STRING1}{ORANGE} za {WHITE}{CURRENCY_LONG}
STR_COMPANY_GOAL :Dostavite {GOLD}{CARGO_LONG} {ORANGE}u {STRING} STR_COMPANY_GOAL :Dostavite {GOLD}{CARGO_LONG} {ORANGE}u {STRING1}
STR_COMPANY_GOAL_REWARD_NEWS :Novi zadatak! Dostavite {CARGO_LONG} u {STRING} za {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_NEWS :Novi zadatak! Dostavite {CARGO_LONG} u {STRING1} za {CURRENCY_LONG}
STR_COMPANY_GOAL_NEWS :Novi zadatak! Dostavite {CARGO_LONG} u {STRING} STR_COMPANY_GOAL_NEWS :Novi zadatak! Dostavite {CARGO_LONG} u {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}gotovo STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}gotovo
STR_COMPANY_GOAL_REWARD_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno u {STRING} i zarađeno {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno u {STRING1} i zarađeno {CURRENCY_LONG}
STR_COMPANY_GOAL_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno u {STRING} STR_COMPANY_GOAL_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno u {STRING1}
STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}godin{P a e a} preostaje STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}godin{P a e a} preostaje
STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mesec{P "" a i} preostaje STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mesec{P "" a i} preostaje
STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dan{P "" a a} preostaje STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dan{P "" a a} preostaje

View File

@@ -1,9 +1,9 @@
##plural 1 ##plural 1
STR_COMPANY_GOAL :运送 {GOLD}{CARGO_LONG} {ORANGE} 到 {STRING} STR_COMPANY_GOAL :运送 {GOLD}{CARGO_LONG} {ORANGE} 到 {STRING1}
STR_COMPANY_GOAL_NEWS :新目标! 运送{CARGO_LONG} 到 {STRING} STR_COMPANY_GOAL_NEWS :新目标! 运送{CARGO_LONG} 到 {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE} 完成 STR_PROGRESS :{YELLOW}{NUM}% {ORANGE} 完成
STR_COMPANY_GOAL_WON_NEWS :目标达成! {CARGO_LONG} 已运输到 {STRING} STR_COMPANY_GOAL_WON_NEWS :目标达成! {CARGO_LONG} 已运输到 {STRING1}
STR_TIMEOUT_YEARS :剩余 {GOLD}{NUM} {ORANGE} 年 STR_TIMEOUT_YEARS :剩余 {GOLD}{NUM} {ORANGE} 年
STR_TIMEOUT_MONTHS :剩余 {GOLD}{NUM} {ORANGE} 月 STR_TIMEOUT_MONTHS :剩余 {GOLD}{NUM} {ORANGE} 月
STR_TIMEOUT_DAYS :剩余 {GOLD}{NUM} {ORANGE} 天 STR_TIMEOUT_DAYS :剩余 {GOLD}{NUM} {ORANGE} 天

View File

@@ -1,12 +1,12 @@
##plural 0 ##plural 0
STR_COMPANY_GOAL_REWARD :Entrega {GOLD}{CARGO_LONG} {ORANGE}a {STRING}{ORANGE} para {WHITE}{STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD :Entrega {GOLD}{CARGO_LONG} {ORANGE}a {STRING1}{ORANGE} para {WHITE}{CURRENCY_LONG}
STR_COMPANY_GOAL :Entrega {GOLD}{CARGO_LONG} {ORANGE}a {STRING} STR_COMPANY_GOAL :Entrega {GOLD}{CARGO_LONG} {ORANGE}a {STRING1}
STR_COMPANY_GOAL_REWARD_NEWS :¡Nueva meta! Entrega {CARGO_LONG} a {STRING} para {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_NEWS :¡Nueva meta! Entrega {CARGO_LONG} a {STRING1} para {CURRENCY_LONG}
STR_COMPANY_GOAL_NEWS :¡Nueva meta! Entrega {CARGO_LONG} a {STRING} STR_COMPANY_GOAL_NEWS :¡Nueva meta! Entrega {CARGO_LONG} a {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}hecho STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}hecho
STR_COMPANY_GOAL_REWARD_WON_NEWS :¡Meta conseguida! {CARGO_LONG} entregado a {STRING} y ganado {STRING}{CURRENCY_LONG} STR_COMPANY_GOAL_REWARD_WON_NEWS :¡Meta conseguida! {CARGO_LONG} entregado a {STRING1} y ganado {CURRENCY_LONG}
STR_COMPANY_GOAL_WON_NEWS :¡Meta conseguida! {CARGO_LONG} entregado a {STRING} STR_COMPANY_GOAL_WON_NEWS :¡Meta conseguida! {CARGO_LONG} entregado a {STRING1}
STR_TIMEOUT_YEARS :{ORANGE}Quedan {GOLD}{NUM} {ORANGE}año{P "" s} STR_TIMEOUT_YEARS :{ORANGE}Quedan {GOLD}{NUM} {ORANGE}año{P "" s}
STR_TIMEOUT_MONTHS :{ORANGE}Quedan {GOLD}{NUM} {ORANGE}mes{P "" es} STR_TIMEOUT_MONTHS :{ORANGE}Quedan {GOLD}{NUM} {ORANGE}mes{P "" es}
STR_TIMEOUT_DAYS :{ORANGE}Quedan {GOLD}{NUM} {ORANGE}día{P "" s} STR_TIMEOUT_DAYS :{ORANGE}Quedan {GOLD}{NUM} {ORANGE}día{P "" s}

View File

@@ -1,9 +1,9 @@
##plural 0 ##plural 0
STR_COMPANY_GOAL :Leverera {GOLD}{CARGO_LONG} {ORANGE}till {STRING} STR_COMPANY_GOAL :Leverera {GOLD}{CARGO_LONG} {ORANGE}till {STRING1}
STR_COMPANY_GOAL_NEWS :Nytt mål! Leverera {CARGO_LONG} till {STRING} STR_COMPANY_GOAL_NEWS :Nytt mål! Leverera {CARGO_LONG} till {STRING1}
STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}klart STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}klart
STR_COMPANY_GOAL_WON_NEWS :Mål slutfört! {CARGO_LONG} levererades till {STRING} STR_COMPANY_GOAL_WON_NEWS :Mål slutfört! {CARGO_LONG} levererades till {STRING1}
STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}år återstår STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}år återstår
STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}månad{P "" er} återstår STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}månad{P "" er} återstår
STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dag{P "" ar} återstår STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dag{P "" ar} återstår

View File

@@ -257,7 +257,7 @@ function BeeRewardClass::FindChallenge(cargo_index, distance, comp_id)
} }
} }
if (prod_score > best_score) { // The accepting industry is better than what we have. if (prod_score > best_score) { // The accepting industry is better than what we have.
prod_score = best_score; best_score = prod_score;
best_accept = accept; best_accept = accept;
} }
} }