Merge branch 'mycard:master' into patch-1

appveyor.yml

@@ -17,7 +17,7 @@ build_script:
 
 after_build:
   - ps: |
-      if(-not $env:appveyor_pull_request_number) {
+      if(-not $env:appveyor_pull_request_number -and $env:APPVEYOR_REPO_BRANCH -eq 'master') {
         $env:GIT_REDIRECT_STDERR = '2>&1'
         git fetch --depth 1 origin dump:dump
         git checkout dump

locales/en-US/strings.conf

@@ -1250,7 +1250,6 @@
 !setname 0x1c9 Dragon Tail
 !setname 0x1ca Yummy
 !setname 0x1cb K9
-!setname 0x2cc Teleport
-!setname 0x2cd Art Mage
-!setname 0x2ce Imprisoned Deity
-!setname 0x2cf Koala
+!setname 0x1cc Teleport
+!setname 0x1cd Artmage
+!setname 0x1ce Imprisoned Deity
\ No newline at end of file
\ No newline at end of file

locales/fr-FR/strings.conf

@@ -1250,7 +1250,6 @@
 !setname 0x1c9 Queue de Dragon
 !setname 0x1ca Succulent
 !setname 0x1cb K9
-!setname 0x2cc Téléporteur
-!setname 0x2cd Artmegia
-!setname 0x2ce Divinité Emprisonnée
-!setname 0x2cf Koala
+!setname 0x1cc Téléporteur
+!setname 0x1cd Artmage
+!setname 0x1ce Divinité Emprisonnée
\ No newline at end of file
\ No newline at end of file

locales/ge-DE/strings.conf

@@ -1250,7 +1250,6 @@
 !setname 0x1c9 Drachenschweif
 !setname 0x1ca Lecker
 !setname 0x1cb K9
-!setname 0x2cc Teleport
-!setname 0x2cd Kunstmagier
-!setname 0x2ce Gefangene Gottheit
-!setname 0x2cf Koala
+!setname 0x1cc Teleport
+!setname 0x1cd Kunstmagus
+!setname 0x1ce Gefangene Gottheit
\ No newline at end of file
\ No newline at end of file

locales/it-IT/strings.conf

@@ -1247,10 +1247,9 @@
 !setname 0x1c6 Dominus
 !setname 0x1c7 Serket
 !setname 0x1c8 Apophis
-!setname 0x1c9 Coda di drago
-!setname 0x1ca Delizioso
+!setname 0x1c9 Dracocoda
+!setname 0x1ca Stuzzicante
 !setname 0x1cb K9
-!setname 0x2cc Teletrasporto
-!setname 0x2cd Mago dell'arte
-!setname 0x2ce Divinità imprigionata
-!setname 0x2cf Koala
+!setname 0x1cc Teletrasporto
+!setname 0x1cd Artmage
+!setname 0x1ce Divinità imprigionata
\ No newline at end of file
\ No newline at end of file

locales/ja-JP/strings.conf

@@ -663,7 +663,7 @@
 !counter 0x106b 狂愛カウンター
 !counter 0x6c アクセスカウンター
 !counter 0x6d 祝台カウンター
-!counter 0x6e 季節インジケーター
+!counter 0x6e シキカウンター
 #setnames, using tab for comment
 !setname 0x1 Ａ・Ｏ・Ｊ
 !setname 0x2 ジェネクス
@@ -1259,7 +1259,6 @@
 !setname 0x1c9 星辰（ドラゴンテイル）
 !setname 0x1ca ヤミー
 !setname 0x1cb Ｋ9
-!setname 0x2cc テレポート
-!setname 0x2cd アルトメギア
-!setname 0x2ce 獄ごく神
-!setname 0x2cf コアラ
+!setname 0x1cc テレポート
+!setname 0x1cd 神芸（アルトメギア）
+!setname 0x1ce 獄神
\ No newline at end of file
\ No newline at end of file

locales/ko-KR/strings.conf

@@ -1260,7 +1260,6 @@
 !setname 0x1c9 드래곤테일
 !setname 0x1ca 야미
 !setname 0x1cb K9
-!setname 0x2cc 텔레포트
-!setname 0x2cd 아르토메기아
-!setname 0x2ce 옥신
-!setname 0x2cf 코알라
+!setname 0x1cc 텔레포트
+!setname 0x1cd 아르토메기아
+!setname 0x1ce 옥신
\ No newline at end of file
\ No newline at end of file

locales/pt-PT/strings.conf

@@ -1250,7 +1250,6 @@
 !setname 0x1c9 Cauda de Dragão
 !setname 0x1ca Yummy
 !setname 0x1cb K9
-!setname 0x2cc Teleporte
-!setname 0x2cd Mago da Arte
-!setname 0x2ce Divindade Aprisionada
-!setname 0x2cf Koala
+!setname 0x1cc Teleporte
+!setname 0x1cd Artmage
+!setname 0x1ce Divindade Aprisionada
\ No newline at end of file
\ No newline at end of file