Skip to content

Commit

Permalink
Merge branch 'release/3641'
Browse files Browse the repository at this point in the history
  • Loading branch information
Sheeo committed Jul 12, 2015
2 parents 0fbd49e + c4a7681 commit b95ee6c
Show file tree
Hide file tree
Showing 748 changed files with 16,285 additions and 13,369 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
10 changes: 8 additions & 2 deletions LOC/ES/strings_db.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2000,7 +2000,6 @@ tooltipui0100="Cambia entre ingresos por segundo o eficiencia."
tooltipui0101="Almacén de masa"
tooltipui0102="Niveles de almacenamiento de masa actuales y máximos."
tooltipui0103="Ingresos/gastos de masa"
tooltipui0104="Activa o desactiva la visualización de la masa generada y consumida por segundo."
tooltipui0105="Generación"
tooltipui0106="Determina si los lugares de inicio están predeterminados o no."
tooltipui0120="Establece si los equipos están bloqueados o desbloqueados."
Expand Down Expand Up @@ -7096,6 +7095,8 @@ tooltipui0686="Sin Billy"
tooltipui0687="Previene a los comandantes de la UEF mejorar su ACU con el arma nuclear táctica 'Billy'"
tooltipui0688="Sin súper sistemas de intelegencia militar"
tooltipui0689="Quita el Aeon Ojo de Rhianne y el Cybran Soothesayer"
tooltipui0690="Drone Auto-Rebuild"
tooltipui0691="Toggle if this drone rebuilds upon death"

tooltipui0540="Restablecer ventana de chat"
tooltipui0541="Restablece la posición y apariencia de la ventana de chat."
Expand All @@ -7104,7 +7105,6 @@ tooltipui0543="Cambia entre ingresos por segundo y factores de eficiencia."
tooltipui0544="Almacén de energía"
tooltipui0545="Niveles de almacenamiento de energía actuales y máximos."
tooltipui0546="Ingresos y gastos energéticos"
tooltipui0547="Cambia entre energía generada y consumida por segundo."
tooltipui0548="Construcción"
tooltipui0549="Te permite construir nuevas unidades con las unidades seleccionadas."
tooltipui0550="Construcción"
Expand Down Expand Up @@ -7487,3 +7487,9 @@ lobui_0606="Left vs Right"
desync_0002="Don't tell me any more"
desync_0003="Game state has become inconsistent between the players in this game. This means the simulation may evolve differently for different players from this point. The game is extremely likely to terminate abruptly quite soon."
desync_0004="Diagnostic Info"
tooltipui0547 = "Energy being generated and spent per second"
tooltipui0104 = "Mass being generated and spent per second"
tooltipui0700 = "Mass Reclaimed"
tooltipui0701 = "Mass income due to reclaim, and total mass reclaimed so far"
tooltipui0702 = "Energy Reclaimed"
tooltipui0703 = "Energy income due to reclaim, and total energy reclaimed so far"
10 changes: 8 additions & 2 deletions LOC/FR/strings_db.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2000,7 +2000,6 @@ tooltipui0100="Alterne entre l'affichage du revenu par seconde et le taux d'effi
tooltipui0101="Stockage de masse"
tooltipui0102="Valeurs actuelle et maximale de stockage de masse."
tooltipui0103="Revenu/dépense de masse"
tooltipui0104="Affiche/masque la masse totale générée et dépensée par seconde."
tooltipui0105="Départ"
tooltipui0106="Ceci permet de déterminer si les point de départ sont prédéterminés ou aléatoires."
tooltipui0120="Ceci permet de déterminer si les équipes sont verrouillées ou déverrouillées."
Expand Down Expand Up @@ -7095,6 +7094,8 @@ tooltipui0686="Pas de Billy"
tooltipui0687="Empêche les commandants UEF d'améliorer leur ACU avec un missile nucléaire tactique 'Billy'"
tooltipui0688="Pas de super structures d'espionage"
tooltipui0689="Pas d'Oeil de Rihanne (Aeon) ni de Devin (Cybran)"
tooltipui0690="Drone Auto-Rebuild"
tooltipui0691="Toggle if this drone rebuilds upon death"

tooltipui0540="Réinitialiser la fenêtre de discussion"
tooltipui0541="Réinitialise la position et la disposition de la fenêtre de discussion."
Expand All @@ -7103,7 +7104,6 @@ tooltipui0543="Alterne entre l'affichage du revenu par seconde et le taux d'effi
tooltipui0544="Stockage d'énergie"
tooltipui0545="Valeurs actuelle et maximale de stockage d'énergie."
tooltipui0546="Revenu et dépense d'énergie"
tooltipui0547="Affiche/masque l'énergie produite et dépensée par seconde."
tooltipui0548="Construction"
tooltipui0549="Vous permet de construire de nouvelles unités avec les unités sélectionnées."
tooltipui0550="Construction"
Expand Down Expand Up @@ -7488,3 +7488,9 @@ desync_0002="Don't tell me any more"
desync_0003="Game state has become inconsistent between the players in this game. This means the simulation may evolve differently for different players from this point. The game is extremely likely to terminate abruptly quite soon."
desync_0004="Diagnostic Info"

tooltipui0547 = "Energy being generated and spent per second"
tooltipui0104 = "Mass being generated and spent per second"
tooltipui0700 = "Mass Reclaimed"
tooltipui0701 = "Mass income due to reclaim, and total mass reclaimed so far"
tooltipui0702 = "Energy Reclaimed"
tooltipui0703 = "Energy income due to reclaim, and total energy reclaimed so far"
11 changes: 8 additions & 3 deletions LOC/IT/strings_db.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2000,7 +2000,6 @@ tooltipui0100="Alterna i valori delle entrate al secondo e della valutazione di
tooltipui0101="Riserve di massa"
tooltipui0102="Valori delle riserve di massa attuali e massimi"
tooltipui0103="Massa accumulata/spesa"
tooltipui0104="Alterna la visualizzazione della massa generata e spesa al secondo"
tooltipui0105="Posiz."
tooltipui0106="Determina se i Punti di inizio sono predeterminati o casuali."
tooltipui0120="Determina se le squadre sono bloccate o sbloccate."
Expand Down Expand Up @@ -7097,7 +7096,8 @@ tooltipui0686="No Billy"
tooltipui0687="Rimuove la possibilita per i comandanti UEF di aggiungere al commander 'Billy' missile tattico nucleare"
tooltipui0688="No Super-Intel"
tooltipui0689="Rimuove l' Occhio di Arianna (Aeon) e il Controllo Perimetrale (Cibrano)"

tooltipui0690="Drone Auto-Rebuild"
tooltipui0691="Toggle if this drone rebuilds upon death"

tooltipui0540="Ripristina finestra chat"
tooltipui0541="Ripristina la posizione e la struttura della finestra della chat"
Expand All @@ -7106,7 +7106,6 @@ tooltipui0543="Alterna i valori delle entrate al secondo e della valutazione di
tooltipui0544="Riserve di energia"
tooltipui0545="Valori delle riserve di energia attuali e massimi"
tooltipui0546="Entrate e consumi di energia"
tooltipui0547="Alterna la visualizzazione dell'energia generata e consumata al secondo"
tooltipui0548="Costruzione"
tooltipui0549="Consente di costruire nuove unità con le unità selezionate"
tooltipui0550="Costruzione"
Expand Down Expand Up @@ -7491,3 +7490,9 @@ lobui_0606="Left vs Right"
desync_0002="Don't tell me any more"
desync_0003="Game state has become inconsistent between the players in this game. This means the simulation may evolve differently for different players from this point. The game is extremely likely to terminate abruptly quite soon."
desync_0004="Diagnostic Info"
tooltipui0547 = "Energy being generated and spent per second"
tooltipui0104 = "Mass being generated and spent per second"
tooltipui0700 = "Mass Reclaimed"
tooltipui0701 = "Mass income due to reclaim, and total mass reclaimed so far"
tooltipui0702 = "Energy Reclaimed"
tooltipui0703 = "Energy income due to reclaim, and total energy reclaimed so far"
Loading

0 comments on commit b95ee6c

Please sign in to comment.