fixing merge conflicts

2026-05-30 17:21:53 +08:00 · 2014-12-07 17:12:46 -05:00
parent 76098f2b59 efe8120ed3
commit d93d2fdff9
7 changed files with 3302 additions and 63 deletions
@@ -4,7 +4,10 @@ var langs = {
 	'es':'español',
 	'fr':'français',
 	'it':'italiano',
+	'jp':'日本',
 	'ko':'한국어',
+	'kr':'한국어',
+	'pg':'português',
 	'pl':'polski',
 	'ru':'русский',
 	'sv':'svenska',
@@ -0,0 +1,3 @@
+.button{width: 100px !important;}
+#outsidePanel .button{width: 115px !important;}
+.eventPanel .button {width: 122px !important;}