Skip to content

Commit

Permalink
Italian translations by DD ModPassion, and a fix.
Browse files Browse the repository at this point in the history
Translation for issue #1.
#29 Removal of "force send CutterAreaEvent" due to it causing other
problems.
  • Loading branch information
DeckerMMIV committed Aug 29, 2014
1 parent 1d9576e commit af0efbb
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 9 deletions.
15 changes: 15 additions & 0 deletions v1/ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
SoilMod - Change log

============================
Post-version 1.2.x

Fixes:

- Removed "force send CutterAreaEvent", as it was causing other problems.

Enhancements:


Additions/updates:

- Italian translations by DD ModPassion


============================
Version 1.2.0

Expand Down
30 changes: 27 additions & 3 deletions v1/PDAModPlugin_SoilCondition/modDesc.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="no" ?>
<modDesc descVersion="12">
<author>Freelance Modding Crew</author>
<contributors>JakobT, Gonimy_Vetrom, VAHA, KingFrame, Albi, webalizer, Marxtai</contributors>
<version>1.2.0</version>
<contributors>JakobT, Gonimy_Vetrom, VAHA, KingFrame, Albi, webalizer, Marxtai, DD ModPassion</contributors>
<version>1.2.1</version>

<title>
<en>PDA Mod Plugin - Soil Condition</en>
<de>PDA Mod Plugin - Soil Condition</de>
<ru>PDA Mod Plugin - Soil Condition</ru>
<cz>PDA Mod Plugin - Stav půdy</cz>
<fr>PDA Mod Plugin - Soil Condition</fr>
<it>PDA Mod Plugin - Soil Condition</it>
</title>
<description>
<en>
Expand Down Expand Up @@ -42,6 +43,12 @@ pour le mod 'Soil Management and Growth Control' (SoilMod).
Decker_MMIV - fs-uk.com, forum.farming-simulator.com, modhoster.com]]>
</fr>
<it>
<![CDATA[Richiede 'PDA MOD.' - questo plugin aggiunge uno schermo aggiuntivo per la
gestione del suolo ed il controllo di crescita mod (SoilMod).
Decker_MMIV - fs-uk.com, forum.farming-simulator.com, modhoster.com]]>
</it>
</description>

<iconFilename>store_SoilCondition.dds</iconFilename>
Expand All @@ -55,6 +62,7 @@ Decker_MMIV - fs-uk.com, forum.farming-simulator.com, modhoster.com]]>
<ru>Состояние почвы</ru>
<cz>Stav půdy</cz>
<fr>Condition du sol</fr>
<it>Condizioni del suolo</it>
</text>

<text name="ScrollDivider">
Expand All @@ -63,14 +71,16 @@ Decker_MMIV - fs-uk.com, forum.farming-simulator.com, modhoster.com]]>
<ru>----- ----- ----- ----- ----- ----- ----- ----- ----- -----</ru>
<cz>----- ----- ----- ----- ----- ----- ----- ----- ----- -----</cz>
<fr>----- ----- ----- ----- ----- ----- ----- ----- ----- -----</fr>
<it>----- ----- ----- ----- ----- ----- ----- ----- ----- -----</it>
</text>

<text name="CurrentLocationScanSize">
<en>Map coordinate: %.0f,%.0f - Scan size: %dx%d</en>
<de>Map-Koordinaten: %.0f,%.0f - Scangröße: %dx%d</de>
<ru>Мое положение: %.0f,%.0f - Площадь: %dx%d</ru>
<cz>Souřadnice GPS: %.0f,%.0f - Rozloha: %dx%d</cz>
<fr>Coordonnées GPS: %.0f,%.0f - Zone scannée: %dx%d </fr>
<fr>Coordonnées GPS: %.0f,%.0f - Zone scannée: %dx%d</fr>
<it>Coordinate mappa: %.0f,%.0f - Area scansionata: %dx%d</it>
</text>

<text name="SoilpH">
Expand All @@ -79,41 +89,47 @@ Decker_MMIV - fs-uk.com, forum.farming-simulator.com, modhoster.com]]>
<ru>Уровень pH: %s</ru>
<cz>Půdní pH: %s</cz>
<fr>pH du sol: %s</fr>
<it>pH terreno: %s</it>
</text>
<text name="FertilizerOrganic">
<en>Fertilizer (organic): %s</en>
<de>Dünger (organisch): %s</de>
<ru>Удобрения органические: %s</ru>
<cz>Hnojivo (organické): %s</cz>
<fr>Engrais (organique): %s</fr>
<it>Fertilizzante (organico): %s</it>
</text>
<text name="FertilizerSynthetic">
<en>Fertilizer (synthetic): %s</en>
<de>Dünger (synthetisch): %s</de>
<ru>Удобрения синтетические: %s</ru>
<cz>Hnojivo (syntetické): %s</cz>
<fr>Engrais (synthétique): %s</fr>
<it>Fertilizzante (sintetico): %s</it>
</text>
<text name="Herbicide">
<en>Herbicide: %s</en>
<de>Herbizide: %s</de>
<ru>Гербициды: %s</ru>
<cz>Herbicid: %s</cz>
<fr>Herbicide: %s</fr>
<it>Erbicida: %s</it>
</text>
<text name="WeedInfestation">
<en>Weed infestation: %s</en>
<de>Unkrautbefall: %s</de>
<ru>Засоренность: %s</ru>
<cz>Zaplevelení: %s</cz>
<fr>Mauvaises herbes: %s</fr>
<it>Infestazione erbaccia: %s</it>
</text>
<text name="CropsInArea">
<en>Crops in area: %s</en>
<de>Frucht im Bereich: %s</de>
<ru>Посеяно на площади: %s</ru>
<cz>Rostliny v oblasti: %s</cz>
<fr>Fruits dans la zone: %s</fr>
<it>Colture nell'area: %s</it>
</text>

<text name="SoilpH_value_denomination">
Expand All @@ -122,41 +138,47 @@ Decker_MMIV - fs-uk.com, forum.farming-simulator.com, modhoster.com]]>
<ru>%.1f (%s)</ru>
<cz>%.1f (%s)</cz>
<fr>%.1f (%s)</fr>
<it>%.1f (%s)</it>
</text>
<text name="NoCalculation">
<en>no calculation</en>
<de>Keine Berechnung</de>
<ru>не расчитано</ru>
<cz>bez výpočtu</cz>
<fr>Aucun calcul</fr>
<it>nessun calcolo</it>
</text>
<text name="FertilizerOrganic_Level">
<en>%.1f level(s)</en>
<de>%.1f Level(s)</de>
<ru>%.1f уровень</ru>
<cz>%.1f úroveň</cz>
<fr>%.1f niveau(x)</fr>
<it>%.1f livello</it>
</text>
<text name="FertilizerSynthetic_Type_pct">
<en>type %s, %d%%</en>
<de>Typ %s, %d%%</de>
<ru>тип %s, %d%%</ru>
<cz>typ %s, %d%%</cz>
<fr>type %s, %d%%</fr>
<it>tipo %s, %d%%</it>
</text>
<text name="Herbicide_Type_pct">
<en>type %s, %d%%</en>
<de>Typ %s, %d%%</de>
<ru>тип %s, %d%%</ru>
<cz>typ %s, %d%%</cz>
<fr>type %s, %d%%</fr>
<it>tipo %s, %d%%</it>
</text>
<text name="WeedInfestation_pct">
<en>%d%%</en>
<de>%d%%</de>
<ru>%d%%</ru>
<cz>%d%%</cz>
<fr>%d%%</fr>
<it>%d%%</it>
</text>

<text name="FruitEffects">
Expand All @@ -165,6 +187,7 @@ Decker_MMIV - fs-uk.com, forum.farming-simulator.com, modhoster.com]]>
<ru>Таблица воздействий</ru>
<cz>Efekt na plodiny</cz>
<fr>Effets sur les fruits</fr>
<it>Effetti coltura</it>
</text>
<text name="FruitEffectsHeader">
<!-- Text must be delimited by | to get 3 columns in PDA screen -->
Expand All @@ -173,6 +196,7 @@ Decker_MMIV - fs-uk.com, forum.farming-simulator.com, modhoster.com]]>
<ru>'Культура'|'Подходит'|'Не подходит'</ru>
<cz>'Plodina'|'Použít'|'Nepoužívat'</cz>
<fr>'Fruit'|'Aime'|'N'aime pas'</fr>
<it>'Colture'|'Consigliato'|'Non consigliato'</it>
</text>
</l10n>

Expand Down
1 change: 1 addition & 0 deletions v1/ReadMe (Deutsch).TXT
Original file line number Diff line number Diff line change
Expand Up @@ -166,3 +166,4 @@ Translation 'DE': JakobT, webalizer.
Translation 'RU': Gonimy_Vetrom, VAHA.
Translation 'CZ': KingFrame, Albi.
Translation 'FR': Marxtai, Dural.
Translation 'IT': DD ModPassion.
1 change: 1 addition & 0 deletions v1/ReadMe (French).TXT
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,4 @@ Translation 'DE': JakobT, webalizer.
Translation 'RU': Gonimy_Vetrom, VAHA.
Translation 'CZ': KingFrame, Albi.
Translation 'FR': Marxtai, Dural.
Translation 'IT': DD ModPassion.
1 change: 1 addition & 0 deletions v1/ReadMe (Russian).TXT
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,4 @@ Script: Decker_MMIV.
Перевод "RU": Gonimy_Vetrom, VAHA.
Перевод "CZ": KingFrame, Albi.
Перевод "FR": Marxtai, Dural.
Перевод "IT": DD ModPassion.
1 change: 1 addition & 0 deletions v1/ReadMe.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,4 @@ Translation 'DE': JakobT, webalizer.
Translation 'RU': Gonimy_Vetrom, VAHA.
Translation 'CZ': KingFrame, Albi.
Translation 'FR': Marxtai, Dural.
Translation 'IT': DD ModPassion.
14 changes: 10 additions & 4 deletions v1/SoilManagement/fmcSoilModPlugins.lua
Original file line number Diff line number Diff line change
Expand Up @@ -404,10 +404,16 @@ function fmcSoilModPlugins.pluginsForCutFruitArea(soilMod)
function(sx,sz,wx,wz,hx,hz, dataStore, fruitDesc)
dataStore.volume = dataStore.volume / 2
dataStore.spraySum = 1
-- Fix for multiplayer, to ensure that event will be sent to clients, if there was something to cut.
if (dataStore.numPixels > 0) or (dataStore.weeds ~= nil and dataStore.weeds.numPixels > 0) then
dataStore.volume = dataStore.volume + 0.0000001
end

-- Below didn't work correctly. Causes problem when graintank less than 5% and there's weed plants.
-- -- Fix for multiplayer, to ensure that event will be sent to clients, if there was something to cut.
-- if (dataStore.numPixels > 0) or (dataStore.weeds ~= nil and dataStore.weeds.numPixels > 0) then
-- dataStore.volume = dataStore.volume + 0.0000001
-- end

-- Thinking of a different approach, to send "cut"-event to clients when volume == 0 and (numPixels > 0 or weed > 0),
-- where a "global variable" will be set, and then afterwards elsewhere it is tested to see if an event should be sent,
-- but it requires appending extra functionality to Combine.update() and similar vanilla methods, which may cause even other problems.
end
)
end
Expand Down
Loading

0 comments on commit af0efbb

Please sign in to comment.