Skip to content

Commit

Permalink
Translation update, and small change to splashscreen.
Browse files Browse the repository at this point in the history
  • Loading branch information
LaChal committed Jan 5, 2015
1 parent 6236fd4 commit 0af8a5c
Show file tree
Hide file tree
Showing 8 changed files with 133 additions and 60 deletions.
19 changes: 14 additions & 5 deletions lang/cs_CZ.trn
Original file line number Diff line number Diff line change
Expand Up @@ -1336,13 +1336,22 @@ o623 Do you want to save your changes?
t623
o624 Don't Save
t624
o625 Press a key to assign to the action \"{0}\"\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o625 Press a key to assign to the action "{0}"

Press ESC to cancel. Press Shift-ESC to unbind.
t625
o626 Press a key to assign to the action \"{0}\"\nNo key means right click to fast nudge.\nPress ESC to cancel. Press Shift-ESC to unbind.
o626 Press a key to assign to the action "{0}"
No key means right click to fast nudge.
Press ESC to cancel. Press Shift-ESC to unbind.
t626
o627 {0} is not a modifier. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o627 {0} is not a modifier. Press a new key.
Press ESC to cancel. Press Shift-ESC to unbind.
t627
o628 Movement keys can't use Ctrl or be with modifiers. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o628 Movement keys can't use Ctrl or be with modifiers. Press a new key.

Press ESC to cancel. Press Shift-ESC to unbind.
t628
o629 You can't use the key {0}. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o629 You can't use the key {0}. Press a new key.

Press ESC to cancel. Press Shift-ESC to unbind.
t629
19 changes: 14 additions & 5 deletions lang/de_DE.trn
Original file line number Diff line number Diff line change
Expand Up @@ -1299,13 +1299,22 @@ o623 Do you want to save your changes?
t623
o624 Don't Save
t624
o625 Press a key to assign to the action \"{0}\"\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o625 Press a key to assign to the action "{0}"

Press ESC to cancel. Press Shift-ESC to unbind.
t625
o626 Press a key to assign to the action \"{0}\"\nNo key means right click to fast nudge.\nPress ESC to cancel. Press Shift-ESC to unbind.
o626 Press a key to assign to the action "{0}"
No key means right click to fast nudge.
Press ESC to cancel. Press Shift-ESC to unbind.
t626
o627 {0} is not a modifier. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o627 {0} is not a modifier. Press a new key.
Press ESC to cancel. Press Shift-ESC to unbind.
t627
o628 Movement keys can't use Ctrl or be with modifiers. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o628 Movement keys can't use Ctrl or be with modifiers. Press a new key.

Press ESC to cancel. Press Shift-ESC to unbind.
t628
o629 You can't use the key {0}. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o629 You can't use the key {0}. Press a new key.

Press ESC to cancel. Press Shift-ESC to unbind.
t629
72 changes: 45 additions & 27 deletions lang/fr_FR.trn
Original file line number Diff line number Diff line change
Expand Up @@ -1303,46 +1303,64 @@ t606 Nom joueur(s) :
o607 Chunks Borders
t607 Bords des chunks
o608 Fast Nudge
t608
t608 Pousser rapide
o609 Clone Fast Nudge Settings
t609
t609 Régl. posser rapide clonage
o610 Move by the width of selection
t610
t610 Dépl. par largeur de sélection
o611 Moves clone by his width
t611
t611 Dépl. clone par sa largeur
o612 Width of clone movement:
t612
t612 Taille mouvement clone :
o613 Import Fast Nudge Settings:
t613
t613 Import. réglages pousser rapide
o614 Move by the width of schematic
t614
t614 Dépl. par largeur du schematic
o615 Moves selection by his width
t615
t615 Dépl.sélection par sa largeur
o616 Width of import movement:
t616
t616 Taill du dépl. de l'import
o617 Import Options
t617
t617 Options d'import
o618 Blocks Fast Nudge Settings:
t618
t618 Régl. dépl. rapide des blocs
o619 Selection Fast Nudge Settings:
t619
t619 Régl. dépl. rapide des sélections
o620 Points Fast Nudge Settings:
t620
t620 Régl. dépl. rapides des points :
o621 Moves points by the selection's width
t621
t621 Déplace les points par la taille de la sélection
o622 Width of points movement:
t622
t622 Taille des dépl. des points :
o623 Do you want to save your changes?
t623
t623 Sauvegarder les changements ?
o624 Don't Save
t624
o625 Press a key to assign to the action \"{0}\"\n\nPress ESC to cancel. Press Shift-ESC to unbind.
t625
o626 Press a key to assign to the action \"{0}\"\nNo key means right click to fast nudge.\nPress ESC to cancel. Press Shift-ESC to unbind.
t626
o627 {0} is not a modifier. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
t627
o628 Movement keys can't use Ctrl or be with modifiers. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
t628
o629 You can't use the key {0}. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
t629
t624 Ne pas sauver
o625 Press a key to assign to the action "{0}"

Press ESC to cancel. Press Shift-ESC to unbind.
t625 Appuyez sur une touche pour l'action "{0}"

ESC pour annuler. SHIFT-ESC pour supprimer.
o626 Press a key to assign to the action "{0}"
No key means right click to fast nudge.
Press ESC to cancel. Press Shift-ESC to unbind.
t626 Appuyez sur une touche pour l'action "{0}"
Acune touche = clic-droit.
ESC pour annuler. SHIFT-ESC pour supprimer.
o627 {0} is not a modifier. Press a new key.
Press ESC to cancel. Press Shift-ESC to unbind.
t627 {0} n'est pas un modificateur. Choisissez une autre touche.
ESC pour annuler. SHIFT-ESC pour supprimer.
o628 Movement keys can't use Ctrl or be with modifiers. Press a new key.

Press ESC to cancel. Press Shift-ESC to unbind.
t628 Les touche de mouvement ne peuvent être associée à Ctrl ou un autre modificateur.
Choisissez-en une autre.
ESC pour annuler. SHIFT-ESC pour supprimer.
o629 You can't use the key {0}. Press a new key.

Press ESC to cancel. Press Shift-ESC to unbind.
t629 Vous ne pouvez utiliser la touche {0}. Choisissez-en une autre.

ESC pour annuler. SHIFT-ESC pour supprimer.
40 changes: 30 additions & 10 deletions lang/ko_KR.trn
Original file line number Diff line number Diff line change
Expand Up @@ -1321,13 +1321,33 @@ o623 Do you want to save your changes?
t623 저장하시겠습니까?
o624 Don't Save
t624 저장 안함
o625 Press a key to assign to the action \"{0}\"\n\nPress ESC to cancel. Press Shift-ESC to unbind.
t625 작업을 지정할 키를 누르십시오 \"{0}\"\n\n취소하려면 ESC를 누르십시오. 해제하려면 Shift-ESC를 누르십시오.
o626 Press a key to assign to the action \"{0}\"\nNo key means right click to fast nudge.\nPress ESC to cancel. Press Shift-ESC to unbind.
t626 작업을 지정할 키를 누르십시오 \"{0}\"\n키가 없다면 우클릭으로 빠른 이동을 합니다.\n취소하려면 ESC를 누르십시오. 해제하려면 Shift-ESC를 누르십시오.
o627 {0} is not a modifier. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
t627 {0}는 modifier가 아닙니다. 다른 키를 누르십시오.\n\n취소하려면 ESC를 누르십시오. 해제하려면 Shift-ESC를 누르십시오.
o628 Movement keys can't use Ctrl or be with modifiers. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
t628 이동 키는 Ctrl이나 modifier과 함께 사용할 수 없습니다. 다른 키를 누르십시오.\n\n취소하려면 ESC를 누르십시오. 해제하려면 Shift-ESC를 누르십시오.
o629 You can't use the key {0}. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
t629 {0}는 사용할 수 없는 키입니다. 다른 키를 누르십시오.\n\n취소하려면 ESC를 누르십시오. 해제하려면 Shift-ESC를 누르십시오.
o625 Press a key to assign to the action "{0}"

Press ESC to cancel. Press Shift-ESC to unbind.
t625 작업을 지정할 키를 누르십시오 "{0}"

취소하려면 ESC를 누르십시오. 해제하려면 Shift-ESC를 누르십시오.
o626 Press a key to assign to the action "{0}"
No key means right click to fast nudge.
Press ESC to cancel. Press Shift-ESC to unbind.
t626 작업을 지정할 키를 누르십시오 "{0}"
키가 없다면 우클릭으로 빠른 이동을 합니다.
취소하려면 ESC를 누르십시오. 해제하려면 Shift-ESC를 누르십시오.
o627 {0} is not a modifier. Press a new key.

Press ESC to cancel. Press Shift-ESC to unbind.
t627 {0}는 modifier가 아닙니다. 다른 키를 누르십시오.

취소하려면 ESC를 누르십시오. 해제하려면 Shift-ESC를 누르십시오.
o628 Movement keys can't use Ctrl or be with modifiers. Press a new key.

Press ESC to cancel. Press Shift-ESC to unbind.
t628 이동 키는 Ctrl이나 modifier과 함께 사용할 수 없습니다. 다른 키를 누르십시오.

취소하려면 ESC를 누르십시오. 해제하려면 Shift-ESC를 누르십시오.
o629 You can't use the key {0}. Press a new key.

Press ESC to cancel. Press Shift-ESC to unbind.
t629 {0}는 사용할 수 없는 키입니다. 다른 키를 누르십시오.

취소하려면 ESC를 누르십시오. 해제하려면 Shift-ESC를 누르십시오.
19 changes: 14 additions & 5 deletions lang/nl_NL.trn
Original file line number Diff line number Diff line change
Expand Up @@ -1314,13 +1314,22 @@ o623 Do you want to save your changes?
t623
o624 Don't Save
t624
o625 Press a key to assign to the action \"{0}\"\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o625 Press a key to assign to the action "{0}"

Press ESC to cancel. Press Shift-ESC to unbind.
t625
o626 Press a key to assign to the action \"{0}\"\nNo key means right click to fast nudge.\nPress ESC to cancel. Press Shift-ESC to unbind.
o626 Press a key to assign to the action "{0}"
No key means right click to fast nudge.
Press ESC to cancel. Press Shift-ESC to unbind.
t626
o627 {0} is not a modifier. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o627 {0} is not a modifier. Press a new key.
Press ESC to cancel. Press Shift-ESC to unbind.
t627
o628 Movement keys can't use Ctrl or be with modifiers. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o628 Movement keys can't use Ctrl or be with modifiers. Press a new key.

Press ESC to cancel. Press Shift-ESC to unbind.
t628
o629 You can't use the key {0}. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o629 You can't use the key {0}. Press a new key.

Press ESC to cancel. Press Shift-ESC to unbind.
t629
19 changes: 14 additions & 5 deletions lang/template.trn
Original file line number Diff line number Diff line change
Expand Up @@ -1294,13 +1294,22 @@ o623 Do you want to save your changes?
t623
o624 Don't Save
t624
o625 Press a key to assign to the action \"{0}\"\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o625 Press a key to assign to the action "{0}"

Press ESC to cancel. Press Shift-ESC to unbind.
t625
o626 Press a key to assign to the action \"{0}\"\nNo key means right click to fast nudge.\nPress ESC to cancel. Press Shift-ESC to unbind.
o626 Press a key to assign to the action "{0}"
No key means right click to fast nudge.
Press ESC to cancel. Press Shift-ESC to unbind.
t626
o627 {0} is not a modifier. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o627 {0} is not a modifier. Press a new key.
Press ESC to cancel. Press Shift-ESC to unbind.
t627
o628 Movement keys can't use Ctrl or be with modifiers. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o628 Movement keys can't use Ctrl or be with modifiers. Press a new key.

Press ESC to cancel. Press Shift-ESC to unbind.
t628
o629 You can't use the key {0}. Press a new key.\n\nPress ESC to cancel. Press Shift-ESC to unbind.
o629 You can't use the key {0}. Press a new key.

Press ESC to cancel. Press Shift-ESC to unbind.
t629
3 changes: 1 addition & 2 deletions splash.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
# Taken from http://www.pygame.org/project-Splash+screen-1186-.html by Rock Achu (rockhachu2)
# and tweaked ;)
import pygame
import time
import os, sys
import os
print 'Splash load...'
os.environ['SDL_VIDEO_CENTERED'] = '1'
pygame.init()
Expand Down
2 changes: 1 addition & 1 deletion utilities/gl_display_context.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from OpenGL import GL, GLU
from OpenGL import GL
from config import config
import pygame
from pygame import display, image
Expand Down

0 comments on commit 0af8a5c

Please sign in to comment.