Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/oy/teeworlds
Browse files Browse the repository at this point in the history
  • Loading branch information
btd committed Apr 10, 2011
2 parents f19593a + 3788d23 commit 82d85c7
Show file tree
Hide file tree
Showing 103 changed files with 751 additions and 718 deletions.
Binary file modified data/countryflags/AR.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/AT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/AU.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/BE.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/BG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/BR.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/BY.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/CA.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/CH.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/CL.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/CN.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/CO.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/CZ.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/DE.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/DK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/EE.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/EG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/ES.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/FI.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/FR.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/GB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/GR.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/HR.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/HU.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/ID.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/countryflags/IL.png
Binary file modified data/countryflags/IN.png
Binary file modified data/countryflags/IR.png
Binary file modified data/countryflags/IT.png
Binary file modified data/countryflags/KZ.png
Binary file modified data/countryflags/LT.png
Binary file added data/countryflags/LU.png
Binary file modified data/countryflags/LV.png
Binary file modified data/countryflags/MX.png
Binary file modified data/countryflags/NL.png
Binary file modified data/countryflags/NO.png
Binary file modified data/countryflags/PH.png
Binary file modified data/countryflags/PK.png
Binary file modified data/countryflags/PL.png
Binary file modified data/countryflags/PT.png
Binary file modified data/countryflags/RO.png
Binary file modified data/countryflags/RS.png
Binary file modified data/countryflags/RU.png
Binary file modified data/countryflags/SA.png
Binary file modified data/countryflags/SE.png
Binary file modified data/countryflags/SK.png
Binary file added data/countryflags/SV.png
Binary file modified data/countryflags/TR.png
Binary file modified data/countryflags/UA.png
Binary file modified data/countryflags/US.png
Binary file modified data/countryflags/XEN.png
Binary file modified data/countryflags/XNI.png
Binary file modified data/countryflags/XSC.png
Binary file modified data/countryflags/XWA.png
Binary file modified data/countryflags/ZA.png
Binary file modified data/countryflags/default.png
8 changes: 4 additions & 4 deletions data/countryflags/index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ DK
EG
== 818

#SV
#== 222
SV
== 222

#GQ
#== 226
Expand Down Expand Up @@ -407,8 +407,8 @@ LV
LT
== 440

#LU
#== 442
LU
== 442

#MO
#== 446
Expand Down
Binary file modified data/editor/entities.png
Binary file modified data/gui_icons.png
18 changes: 9 additions & 9 deletions data/languages/bulgarian.txt
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,6 @@ New name:
News
== Новини

Next
== Нататък

Next weapon
== Следващо оръжие

Expand All @@ -373,9 +370,6 @@ Ok
Open
== Отвори

Page %d of %d
== Страница %d/%d

Parent Folder
== Предишна Папка

Expand Down Expand Up @@ -406,9 +400,6 @@ Players
Please balance teams!
== Моля уравновесете отборите!

Prev
== Назад

Prev. weapon
== Пред. оръжие

Expand Down Expand Up @@ -668,3 +659,12 @@ no limit

##### old translations #####

Page %d of %d
== Страница %d/%d

Next
== Нататък

Prev
== Назад

Loading

0 comments on commit 82d85c7

Please sign in to comment.