Skip to content

Commit

Permalink
Merge 'remotes/trunk'
Browse files Browse the repository at this point in the history
  • Loading branch information
@na-Itms
na-Itms committed Jul 1, 2017
2 parents b7d0c5b + 6175d80 commit 89530a3
Show file tree
Hide file tree
Showing 69 changed files with 95 additions and 204 deletions.
0 ...rt/actors/structures/destruct_celt_cc.xml → ...rt/actors/structures/destruct_brit_cc.xml
View file
File renamed without changes.
1 change: 1 addition & 0 deletions binaries/data/mods/public/gui/session/messages.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,7 @@ function handleNetStatusMessage(message)
Engine.SetPaused(true, false);

g_Disconnected = true;
updateCinemaPath();
closeOpenDialogs();
}
}
Expand Down
2 changes: 1 addition & 1 deletion binaries/data/mods/public/gui/session/session.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,7 @@ function confirmExit()

function updateCinemaPath()
{
let isPlayingCinemaPath = GetSimState().cinemaPlaying;
let isPlayingCinemaPath = GetSimState().cinemaPlaying && !g_Disconnected;

Engine.GetGUIObjectByName("sn").hidden = !g_ShowGUI || isPlayingCinemaPath;
Engine.Renderer_SetSilhouettesEnabled(!isPlayingCinemaPath && Engine.ConfigDB_GetValue("user", "silhouettes") == "true");
Expand Down
16 changes: 16 additions & 0 deletions binaries/data/mods/public/l10n/ar.public-tutorials.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,27 @@ msgid ""
"Before starting, you can toggle between fullscreen and windowed mode using Alt+Enter. You can also change the level of zoom using the mouse wheel and the camera view using any of your keyboard's arrow keys.\n"
"Adjust the game window to your preferences.\n"
msgstr ""
"هذا الدرس التعليمي سوف يُعلمك المبادئ الأساسية في تطوير إقتصادك في اللعبة. طبيعياً أنت سوف تبدأ بمركز للمدينة وبعض الوحدات في طور القرية وتلقائيا، هدفك هو أن تطور وتوسع إمبراطوريتك، في كثير من ألأحيان عن طريق الإنتقال إلي طور البلدة و طور المدينة بعد ذلك.\n"
"\n"
"قبل البدء، يمكنك التبديل بين وضع الشاشة الكاملة و النافذة بإستخدام Alt+Enter. يمكنك أيضاً تغيير البعد والقرب من الأرض عن طريق عجلة الفأرة وتغيير المشهد عن طريق أسهم التحريك في الكيبورد.\n"
"عدل نافذة اللعبة إلي تفضيلك.\n"

#: maps/tutorials/starting_economy_walkthrough.js:6
msgid ""
"To start off, select your building, the Civic Center, by clicking on it. A "
"selection ring in the color of your civilization will be displayed after "
"clicking."
msgstr ""
"لتبدأ، إختر مبناك ،مركز المدينة، من خلال الضغط علية. سوف تظهر دائرة التحديد "
"بلون حضارتك بعد الضغط."

#: maps/tutorials/starting_economy_walkthrough.js:9
msgid ""
"Now that the Civic Center is selected, you will notice that a production panel will appear on the lower right of your screen detailing the actions that the buildings support. For the production panel, available actions are not masked in any color, while an icon masked in either grey or red indicates that the action has not been unlocked or you do not have sufficient resources to perform that action, respectively. Additionally, you can hover your mouse over any icon to show a tooltip with more details.\n"
"The top row of buttons contains portraits of units that may be trained at the building while the bottom one or two rows will have researchable technologies. Hover your mouse over the 'II' icon. The tooltip will tell us that advancing to 'Town Phase' requires both more constructed structures as well as more Food and Wood resources."
msgstr ""
"الأن مع مركز المدينة محدد، سوف تلاحظ أن قائمة الإنتاج سوف تظهر في أسفل يمين الشاشة موضحاً الأفعال المدعومة من قِبل هذا المبني.من أجل قائمة الإنتاج، الأفعال المتوفرة ليست مغطاة بأي لون، في حين ان الأيقونات باللون الأحمر أو الرمادية تظهر أنه إما لم يُفتح بعد أو الموارد غير كافية لهذا الفعل، علي التعاقب. إضافياً يمكنك تمرير الفأرة علي أي أيقونة لكي تظهر تلميح مع تفاصيل أكثر.\n"
"الزران العلويان يحتويان علي وحدات للتدريب في حين أن الأثنين أو الواحد في الأسفل لتطوير التقنيات. مرر الفأرة علي الـ'II'. التلميح سوف يظهر ليخبرنا أنه للتطوير إلي طور البلدة يتطلب مباني مبنية أكثر كما تحتاج أيضاً مزيد من موارد الطعام والخشب."

#: maps/tutorials/starting_economy_walkthrough.js:12
msgid ""
Expand All @@ -48,6 +56,11 @@ msgid ""
"Infantry Citizen Soldiers can gather any land resources while Cavalry "
"Citizen Soldiers can only gather meat from hunted animals.\n"
msgstr ""
"لديك نوعان أساسيان من وحدات البدء: المواطنات و مواطن الجنود. المواطنات هي "
"العاملات إفتراضياً، لكن في وقت الحاجة يمكنها حمل السلاح للقتال. لديك نوعان "
"أساسيان من جنود مواطنين: المشاة و الخيالة. المواطنات و جنود مواطنين المشاة "
"يمكنهم تجميع أي موارد علي الأرض في حين ان جنود مواطنين خيالة يمكنهم فقط "
"تجميع اللحم من الحيوانات المصادة.\n"

#: maps/tutorials/starting_economy_walkthrough.js:15
msgid ""
Expand Down Expand Up @@ -271,6 +284,9 @@ msgid ""
"in the game the most important thing is to gather resources as fast as "
"possible so you are able to build enough troops later."
msgstr ""
"هذه الخريطة سوف تعطيك إرشاد صعب لكي تبدء اللعبة بسلاسة. مبكراً في اللعبة "
"الشئ الأهم هو تجميع الموارد بقدر الأمكان وبأسرع وتيرة ممكنة حتي يمكنك بعد "
"ذلك بناء قوات كافية لاحقاً."

#: maps/tutorials/starting_economy_walkthrough.xml:PlayerData[0].Name:39
msgid "Player 1"
Expand Down
31 changes: 15 additions & 16 deletions binaries/data/mods/public/l10n/ast.public-tutorials.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ msgid ""
"Before starting, you can toggle between fullscreen and windowed mode using Alt+Enter. You can also change the level of zoom using the mouse wheel and the camera view using any of your keyboard's arrow keys.\n"
"Adjust the game window to your preferences.\n"
msgstr ""
"Esti tutorial va enseñar los fundamentos de cómo desendolcar la economía. Polo xeneral, entamarás con un centru cívicu y con delles unidaes na «etapa aldeana» y últimamente, el finxu ye desenvolver y estender l'imperiu, aportando davezu a la «etapa villa» y dempués a la «etapa urbana».\n"
"Esti tutorial va enseñar los fundamentos de cómo desendolcar la economía. Polo xeneral, entamarás con un centru cívicu y con delles unidaes na «etapa aldeana» y finalmente, l'oxetivu va ser desenvolver y estender l'imperiu, aportando davezu a la «etapa villa» y darréu a la «etapa urbana».\n"
"\n"
"Enantes d'escomenzar, yes a alternar ente'l mou pantalla completa y el mou ventanos usando Alt+Entrar. Tamién pues camudar el nivel d'averamientu usando la rueda'l mur y la vista de cámara usando cualesquiera de les fleches del tecláu.\n"
"Enantes d'escomenzar, yes a alternar ente'l mou pantalla completa y el mou ventanos usando Alt+Entrar. Tamién pues cambiar el nivel d'averamientu usando la rueda'l mur y la vista de cámara usando cualesquiera de les fleches del tecláu.\n"
"Axusta'l ventanu'l xuegu como quieras.\n"
" "

Expand All @@ -37,15 +37,15 @@ msgid ""
"clicking."
msgstr ""
"Pa entamar, escueyi l'edificiu, el centru cívicu, calcando nél. En "
"calcándolu apaecerá un círculu d'esbilla del color de la to civilización. "
"calcándolu apaez un círculu d'esbilla del color de la to civilización. "

#: maps/tutorials/starting_economy_walkthrough.js:9
msgid ""
"Now that the Civic Center is selected, you will notice that a production panel will appear on the lower right of your screen detailing the actions that the buildings support. For the production panel, available actions are not masked in any color, while an icon masked in either grey or red indicates that the action has not been unlocked or you do not have sufficient resources to perform that action, respectively. Additionally, you can hover your mouse over any icon to show a tooltip with more details.\n"
"The top row of buttons contains portraits of units that may be trained at the building while the bottom one or two rows will have researchable technologies. Hover your mouse over the 'II' icon. The tooltip will tell us that advancing to 'Town Phase' requires both more constructed structures as well as more Food and Wood resources."
msgstr ""
"Agora qu'esbillasti'l centru cívicu, verás que remanez un panel de producción na esquina baxera derecha de la pantalla, que detalla les aiciones que sofiten los edificios. Nel panel de producción, les aiciones disponibles nun tán cubiertes de dal color, pero un iconu cubiertu de gris o coloráu indica o que l'aición ta pesllada o que te falten recursos abondos pa executar esa aición. Amás, pues allugar el mur enriba de cualquier iconu p'amosar un conseyu con más detalles.\n"
"La filera superior de botones contién retratos d'unidaes que puen llevantase nel edificiu, mentes les dos fileres baxeres tienen teunoloxíes desendolcables. Pasa'l mur enriba l'iconu «II». El conseyu dizmos que pasar a la «etapa villa» rique más construcciones y más recursos d'alimentos y de madera."
"Agora qu'esbillasti'l centru cívicu, verás que remanez un panel de producción na esquina baxera derecha de la pantalla, que detalla les aiciones qu'almiten los edificios. Nel panel de producción, les aiciones disponibles nun tán cubiertes de dal color, pero los iconos cubiertos de gris o coloráu indiquen o que l'aición ta pesllada o que te falten recursos abondos pa executar esa aición. Amás, pues allugar el mur enriba de cualquier iconu p'amosar un conseyu con más detalles.\n"
"La filera superior de botones contién retratos d'unidaes que puen llevantase nel edificiu, y les dos fileres baxeres amuesen teunoloxíes que puen desendolcase. Pasa'l mur enriba l'iconu «II». El conseyu dizmos que p'avanzar a la «etapa villa» hai que facer más construcciones y tener más recursos d'alimentos y de madera."

#: maps/tutorials/starting_economy_walkthrough.js:12
msgid ""
Expand All @@ -57,24 +57,23 @@ msgid ""
"Infantry Citizen Soldiers can gather any land resources while Cavalry "
"Citizen Soldiers can only gather meat from hunted animals.\n"
msgstr ""
"Hai dos tribes principales d'unidaes al emprimar el xuegu: ciudadanes y "
"ciudadanos-soldáu. Les ciudadanes son unidaes puramente económiques; tienen "
"poca vida, dal armadura, y pocu o nengún potencial atacador. Ciudadanos-"
"soldáu son trabayadores por defeutu, pero en tiempos de crisis, puen valise "
"d'un arma pa lluchar. Hai dos clases de ciudadanos-soldáu: infantería y "
"caballería. Les ciudadanes y ciudadanos-soldáu d'infantería son a recoyer "
"cualquier recursu de la tierra, pero los ciudadanos-soldáu de caballería "
"namái son a recoyer carne de caza."
"Hai efeutivamente dos tribes d'unidaes al emprimar el xuegu: les ciudadanes "
"y los ciudadanos-soldáu. Les ciudadanes son unidaes puramente económiques; "
"tienen poca vida, dal armadura, y poca o nenguna capacidá d'atacar. Los "
"ciudadanos-soldáu son trabayadores por defeutu, pero en tiempos de crisis, "
"puen valise d'un arma pa lluchar. Hai dos clases de ciudadanos-soldáu: la "
"infantería y la caballería. Les ciudadanes y los ciudadanos-soldáu "
"d'infantería puen recoyer cualquier recursu de la tierra, pero los "
"ciudadanos-soldáu de caballería namái son a recoyer carne de caza.\n"

#: maps/tutorials/starting_economy_walkthrough.js:15
msgid ""
"As a general rule of thumb, left-clicking represents selection while right-"
"clicking with an entity selected represents an order (gather, build, fight, "
"etc.).\n"
msgstr ""
"Como norma xeneral, calcar col botón esquierdu esbilla mentes que calcar col"
" botón drechu nun ente escoyíu da una orde, (arrecoyer, construyir, lluchar,"
" etc.). "
"Como norma xeneral, calcar col botón esquierdu esbilla y calcar col botón "
"drechu nun ente escoyíu manda, (arrecoyer, construyir, lluchar, etc.). "

#: maps/tutorials/starting_economy_walkthrough.js:18
msgid ""
Expand Down
4 changes: 2 additions & 2 deletions binaries/data/mods/public/l10n/br.public-maps.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0 A.D.\n"
"POT-Creation-Date: 2017-06-04 09:08+0200\n"
"PO-Revision-Date: 2017-06-10 03:17+0000\n"
"PO-Revision-Date: 2017-06-28 15:01+0000\n"
"Last-Translator: Thierry Vignaud <[email protected]>\n"
"Language-Team: Breton (http://www.transifex.com/wildfire-games/0ad/language/br/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -1822,7 +1822,7 @@ msgstr "Bigi"

#: maps/scenarios/Ship Formations.xml:Name:27
msgid "Ship Formations"
msgstr ""
msgstr "Stummadur ar bigi"

#: maps/scenarios/Siwa Oasis.xml:Description:27
msgid ""
Expand Down
8 changes: 4 additions & 4 deletions binaries/data/mods/public/l10n/br.public-simulation-other.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: 0 A.D.\n"
"POT-Creation-Date: 2017-06-04 09:07+0200\n"
"PO-Revision-Date: 2017-06-04 15:55+0000\n"
"Last-Translator: Adrián Chaves Fernández <adriyetichaves@gmail.com>\n"
"PO-Revision-Date: 2017-06-28 15:00+0000\n"
"Last-Translator: Thierry Vignaud <thierry.vignaud@gmail.com>\n"
"Language-Team: Breton (http://www.transifex.com/wildfire-games/0ad/language/br/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -213,7 +213,7 @@ msgstr "Laoskomp hon pobloù bleuñviñ en ur genvevañ e peoc'h, %(_player_)s."
#: simulation/ai/petra/chatHelper.js:79
#, javascript-format
msgid "We have found common ground, %(_player_)s. I accept the alliance."
msgstr ""
msgstr "Kavet eo bet ganeomp un dachenn emglev, %(_player_)s.. Degemer a ran an emglev."

#: simulation/ai/petra/chatHelper.js:80
#, javascript-format
Expand Down Expand Up @@ -349,7 +349,7 @@ msgstr ""
#: simulation/ai/petra/chatHelper.js:132
#, javascript-format
msgid "%(_player_)s, I have decided to revoke my offer for a neutrality pact."
msgstr ""
msgstr "%(_player_)s, dibabet am eus lemel ma c'hulenn emglev neptuegezh."

#: simulation/ai/petra/chatHelper.js:133
#, javascript-format
Expand Down
11 changes: 5 additions & 6 deletions binaries/data/mods/public/l10n/it.public-tutorials.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ msgid ""
msgstr ""
"Questo tutorial insegnerà le basi per lo sviluppo della tua economia. Tipicamente, si avrà inizio con un Centro Civico e un paio di unità nella 'Fase Villaggio' e, fondamentalmente, il tuo obiettivo sarà quello di sviluppare e ampliare il tuo impero, spesso evolvendo in seguito a 'Fase Cittadina' e 'Fase Città'.\n"
"\n"
"\n"
"Prima di iniziare, è possibile alternare la modalità schermo intero e finestra utilizzando Alt + Enter. È anche possibile modificare il livello di zoom utilizzando la rotellina del mouse e il punto di vista della telecamera usando uno dei tasti freccia della tastiera.\n"
"Regola la finestra del gioco alle tue preferenze.\n"
"Regola la visuale del gioco secondo le tue preferenze.\n"

#: maps/tutorials/starting_economy_walkthrough.js:6
msgid ""
Expand All @@ -40,7 +39,7 @@ msgid ""
"clicking."
msgstr ""
"Per iniziare, seleziona il tuo edificio, il Centro Civico, facendo clic su "
"di esso. Verrà visualizzato un anello di selezione nel colore della tua "
"di esso. Verrà visualizzato un anello di selezione del colore della tua "
"civiltà dopo aver fatto clic."

#: maps/tutorials/starting_economy_walkthrough.js:9
Expand All @@ -49,7 +48,7 @@ msgid ""
"The top row of buttons contains portraits of units that may be trained at the building while the bottom one or two rows will have researchable technologies. Hover your mouse over the 'II' icon. The tooltip will tell us that advancing to 'Town Phase' requires both more constructed structures as well as more Food and Wood resources."
msgstr ""
"Ora che il Centro Civico è selezionato, noterete che un pannello di gestione apparirà nella parte inferiore destra dello schermo per descrivere in dettaglio le azioni che attengono agli edifici. Per il pannello di gestione, le azioni disponibili non vengono mascherate in alcun colore, mentre un'icona mascherata in grigio o in rosso indica che l'azione non è stata sbloccata o non dispone di risorse sufficienti per l'esecuzione, rispettivamente. Inoltre, è possibile posizionare il mouse su qualsiasi icona per mostrare un tooltip con ulteriori dettagli.\n"
"La riga superiore dei pulsanti contiene i ritratti delle unità che possono essere addestrate all'edificio, mentre una o due righe inferiori avranno le tecnologie ricercabili. Spostare il mouse sull'icona \"II\". Il tooltip ci dirà che avanzare a 'Town Phase' richiede la costruzione di altri edifici e necessitano più risorse alimentari e legnose."
"La riga superiore dei pulsanti contiene i ritratti delle unità che possono essere addestrate all'edificio, mentre una o due righe inferiori avranno le tecnologie ricercabili. Spostare il mouse sull'icona \"II\". Il tooltip ci dirà che avanzare a 'Fase Cittadina' richiede la costruzione di altri edifici e necessita di più risorse di Cibo e Legno."

#: maps/tutorials/starting_economy_walkthrough.js:12
msgid ""
Expand Down Expand Up @@ -89,7 +88,7 @@ msgid ""
"3) Double-click on a unit. This will select every unit of the same type as the specified unit in your visible window. Triple-click will select all units of the same type on the entire map.\n"
" You can click on an empty space on the map to reset the selection. Try each of these methods before tasking all of your Female Citizens to gather the grapes to the southeast of your Civic Center by right-clicking on the grapes when you have all the Female Citizens selected."
msgstr ""
"A questo punto, gli Alimenti e il Legno sono le risorse più importanti per sviluppare la tua economia, quindi cominciamo a raccogliere il cibo. Le femmine raccolgono cibo che non sia carne più velocemente rispetto alle loro controparti maschili\n"
"A questo punto, il Cibo e il Legno sono le risorse più importanti per sviluppare la tua economia, quindi cominciamo a raccogliere il cibo. Le femmine raccolgono cibo che non sia carne più velocemente rispetto alle loro controparti maschili\n"
"Ci sono innanzitutto tre modi per selezionare unità:\n"
"1) Tenere premuto il pulsante sinistro del mouse e tracciare un rettangolo di selezione che racchiude le unità che si desidera selezionare\n"
"2) Fare clic su uno di essi e quindi aggiungere unità aggiuntive alla selezione facendo clic con il tasto Shift premuto su ogni unità aggiuntiva (o anche tramite il rettangolo di selezione precedente).\n"
Expand Down Expand Up @@ -236,7 +235,7 @@ msgid ""
"If you try to select the three idle Female Citizens by selection rectangle them, there is a high chance that one additional gatherers are included in your selection rectangle. To prevent that, hold the 'i' key while grabing: only idle units are then selected. If during your selection you select the cavalry which may now be idle, you can remove it by pressing the control key while clicking on its corresponding portrait in the selection panel on the bottom."
msgstr ""
"Seleziona i tre rimanenti (inattivi) Cittadini Femminili e ordina loro di costruire una fattoria nel centro della grande area aperta ad ovest del Centro Civico.\n"
"Avrai bisogno di uno spazio adeguato intorno alla fattoria per costruire campi. Inoltre, puoi vedere le capre sul lato ovest per migliorare ulteriormente la nostra efficienza di raccolta degli alimenti se dovessimo mai decidere di macellarle. \n"
"Avrai bisogno di uno spazio adeguato intorno alla fattoria per costruire campi. Inoltre, puoi vedere le capre sul lato ovest per migliorare ulteriormente la nostra efficienza di raccolta di cibo se dovessimo mai decidere di macellarle. \n"
"Se provi a selezionare i tre Cittadini Femminili inattivi, eseguendo una selezione rettangolare, esiste un'alta probabilità che il rettangolo di selezione includa un ulteriore raccoglitore. Per evitare ciò, tieni premuto il tasto 'i' mentre selezioni: verranno quindi selezionate solo le unità inattive. Se durante la selezione prendi anche la cavalleria che può essere inattiva, è possibile rimuoverla premendo il tasto di controllo facendo clic sul relativo ritratto nel pannello di selezione in basso."

#: maps/tutorials/starting_economy_walkthrough.js:158
Expand Down
Loading

0 comments on commit 89530a3

Please sign in to comment.