From 062b6cdb0079de2d4b5956f0d2e7d7ca28acb52e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Wed, 15 Feb 2017 16:43:25 +0800 Subject: [PATCH 01/10] Added dummy Deutsch language localization. --- oxt/AddonConfiguration.xcu | 57 +++++- oxt/Addons.xcu | 9 +- oxt/META-INF/manifest.xml | 1 + oxt/Office/UI/BaseWindowState.xcu | 3 +- oxt/Office/UI/BasicIDEWindowState.xcu | 3 +- oxt/Office/UI/CalcWindowState.xcu | 3 +- oxt/Office/UI/DrawWindowState.xcu | 3 +- oxt/Office/UI/ImpressWindowState.xcu | 3 +- oxt/Office/UI/MathWindowState.xcu | 3 +- oxt/Office/UI/StartModuleWindowState.xcu | 3 +- oxt/Office/UI/WriterWindowState.xcu | 3 +- .../DialogStrings_de_DE.properties | 170 ++++++++++++++++++ oxt/description.xml | 1 + oxt/pkg-desc/pkg-description.de-DE.txt | 4 + 14 files changed, 252 insertions(+), 14 deletions(-) create mode 100644 oxt/PokemonGoIV/DialogStrings_de_DE.properties create mode 100644 oxt/pkg-desc/pkg-description.de-DE.txt diff --git a/oxt/AddonConfiguration.xcu b/oxt/AddonConfiguration.xcu index 0beb695..1a1ce0b 100644 --- a/oxt/AddonConfiguration.xcu +++ b/oxt/AddonConfiguration.xcu @@ -10,6 +10,7 @@ Calculates the individual values (IVs) of the Pokémon. 計算寶可夢的 IV 值。 + Calculates the individual values (IVs) of the Pokémon. @VERSION@ @@ -25,11 +26,24 @@ imacat@mail.imacat.idv.tw - Copyright © 2016 imacat - 版權所有 © 2016 依瑪貓 + Copyright © 2016-2017 imacat + 版權所有 © 2016-2017 依瑪貓 + Copyright © 2016-2017 imacat - + + + + Andreas Frisch + + + andreas@repairfox.de + + + German + + + @@ -38,21 +52,25 @@ Found no matching IV. 找不出符合的 IV 值。 + Found no matching IV. Attack + Attack Defense + Defense HP + HP @@ -60,56 +78,67 @@ Candela, leader of Team Valor, says: Valor 隊隊長 Candela 說： + Candela, leader of Team Valor, says: Overall, your [Pokémon] simply amazes me. It can accomplish anything! + Overall, your [Pokémon] simply amazes me. It can accomplish anything! Overall, your [Pokémon] is a strong Pokémon. You should be proud! + Overall, your [Pokémon] is a strong Pokémon. You should be proud! Overall, your [Pokémon] is a decent Pokémon. + Overall, your [Pokémon] is a decent Pokémon. Overall, your [Pokémon] may not be great in battle, but I still like it! + Overall, your [Pokémon] may not be great in battle, but I still like it! Its [Stat] is its strongest feature. + Its [Stat] is its strongest feature. I'm just as impressed with its [Stat]. + I'm just as impressed with its [Stat]. I'm blown away by its stats. WOW! + I'm blown away by its stats. WOW! It's got excellent stats! How exciting! + It's got excellent stats! How exciting! Its stats indicate that in battle, it'll get the job done. + Its stats indicate that in battle, it'll get the job done. Its stats don't point to greatness in battle. + Its stats don't point to greatness in battle. @@ -117,56 +146,67 @@ Blanche, leader of Team Mystic, says: Mystic 隊隊長 Blanche 說： + Blanche, leader of Team Mystic, says: Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon! + Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon! Overall, your [Pokémon] has certainly caught my attention. + Overall, your [Pokémon] has certainly caught my attention. Overall, your [Pokémon] is above average. + Overall, your [Pokémon] is above average. Overall, your [Pokémon] is not likely to make much headway in battle. + Overall, your [Pokémon] is not likely to make much headway in battle. I see that its best attribute is its [Stat]. + I see that its best attribute is its [Stat]. It is matched equally by its [Stat]. + It is matched equally by its [Stat]. Its stats exceed my calculations. It's incredible! + Its stats exceed my calculations. It's incredible! I am certainly impressed by its stats, I must say. + I am certainly impressed by its stats, I must say. Its stats are noticeably trending to the positive. + Its stats are noticeably trending to the positive. Its stats are not out of the norm, in my opinion. + Its stats are not out of the norm, in my opinion. @@ -174,56 +214,67 @@ Spark, leader of Team Instinct, says: Instinct 隊隊長 Spark 說： + Spark, leader of Team Instinct, says: Overall, your [Pokémon] is not likely to make much headway in battle. + Overall, your [Pokémon] is not likely to make much headway in battle. Overall, your [Pokémon] is really strong! + Overall, your [Pokémon] is really strong! Overall, your [Pokémon] is pretty decent! + Overall, your [Pokémon] is pretty decent! Overall, your [Pokémon] has room for improvement as far as battling goes. + Overall, your [Pokémon] has room for improvement as far as battling goes. Its best quality is [Stat]. + Its best quality is [Stat]. Its [Stat] is great, too! + Its [Stat] is great, too! Its stats are the best I've ever seen! No doubt about it! + Its stats are the best I've ever seen! No doubt about it! Its stats are really strong! Impressive. + Its stats are really strong! Impressive. It's definitely got some good stats. Definitely! + It's definitely got some good stats. Definitely! Its stats are all right, but kinda basic, as far as I can see. + Its stats are all right, but kinda basic, as far as I can see. diff --git a/oxt/Addons.xcu b/oxt/Addons.xcu index 0a6285f..02d7bde 100644 --- a/oxt/Addons.xcu +++ b/oxt/Addons.xcu @@ -9,8 +9,9 @@ - Pokémon GO IV Calculator + Pokémon GO IV Calculator 寶可夢 GO IV 計算機 + Pokémon GO IV Calculator @@ -24,8 +25,9 @@ %origin%/icons/image1 - Calculates Pokémon IV + Calculates Pokémon IV 計算寶可夢 IV + Calculates Pokémon IV _self @@ -45,8 +47,9 @@ %origin%/icons/image1 - Calculates Pokémon IV + Calculates Pokémon IV 計算寶可夢 IV + Calculates Pokémon IV _self diff --git a/oxt/META-INF/manifest.xml b/oxt/META-INF/manifest.xml index 60352d4..44a9126 100644 --- a/oxt/META-INF/manifest.xml +++ b/oxt/META-INF/manifest.xml @@ -3,6 +3,7 @@ + diff --git a/oxt/Office/UI/BaseWindowState.xcu b/oxt/Office/UI/BaseWindowState.xcu index 1d37e1e..9ff1b11 100644 --- a/oxt/Office/UI/BaseWindowState.xcu +++ b/oxt/Office/UI/BaseWindowState.xcu @@ -7,8 +7,9 @@ - Pokémon GO IV Calculator + Pokémon GO IV Calculator 寶可夢 GO IV 計算機 + Pokémon GO IV Calculator diff --git a/oxt/Office/UI/BasicIDEWindowState.xcu b/oxt/Office/UI/BasicIDEWindowState.xcu index e6d658e..639d74c 100644 --- a/oxt/Office/UI/BasicIDEWindowState.xcu +++ b/oxt/Office/UI/BasicIDEWindowState.xcu @@ -7,8 +7,9 @@ - Pokémon GO IV Calculator + Pokémon GO IV Calculator 寶可夢 GO IV 計算機 + Pokémon GO IV Calculator diff --git a/oxt/Office/UI/CalcWindowState.xcu b/oxt/Office/UI/CalcWindowState.xcu index 4f832da..0e28e97 100644 --- a/oxt/Office/UI/CalcWindowState.xcu +++ b/oxt/Office/UI/CalcWindowState.xcu @@ -7,8 +7,9 @@ - Pokémon GO IV Calculator + Pokémon GO IV Calculator 寶可夢 GO IV 計算機 + Pokémon GO IV Calculator diff --git a/oxt/Office/UI/DrawWindowState.xcu b/oxt/Office/UI/DrawWindowState.xcu index ec05ee1..4713186 100644 --- a/oxt/Office/UI/DrawWindowState.xcu +++ b/oxt/Office/UI/DrawWindowState.xcu @@ -7,8 +7,9 @@ - Pokémon GO IV Calculator + Pokémon GO IV Calculator 寶可夢 GO IV 計算機 + Pokémon GO IV Calculator diff --git a/oxt/Office/UI/ImpressWindowState.xcu b/oxt/Office/UI/ImpressWindowState.xcu index bd43ced..93aea78 100644 --- a/oxt/Office/UI/ImpressWindowState.xcu +++ b/oxt/Office/UI/ImpressWindowState.xcu @@ -7,8 +7,9 @@ - Pokémon GO IV Calculator + Pokémon GO IV Calculator 寶可夢 GO IV 計算機 + Pokémon GO IV Calculator diff --git a/oxt/Office/UI/MathWindowState.xcu b/oxt/Office/UI/MathWindowState.xcu index 87e9ede..4f52357 100644 --- a/oxt/Office/UI/MathWindowState.xcu +++ b/oxt/Office/UI/MathWindowState.xcu @@ -7,8 +7,9 @@ - Pokémon GO IV Calculator + Pokémon GO IV Calculator 寶可夢 GO IV 計算機 + Pokémon GO IV Calculator diff --git a/oxt/Office/UI/StartModuleWindowState.xcu b/oxt/Office/UI/StartModuleWindowState.xcu index e82d23d..4d2cfed 100644 --- a/oxt/Office/UI/StartModuleWindowState.xcu +++ b/oxt/Office/UI/StartModuleWindowState.xcu @@ -7,8 +7,9 @@ - Pokémon GO IV Calculator + Pokémon GO IV Calculator 寶可夢 GO IV 計算機 + Pokémon GO IV Calculator diff --git a/oxt/Office/UI/WriterWindowState.xcu b/oxt/Office/UI/WriterWindowState.xcu index 62f270a..4d99555 100644 --- a/oxt/Office/UI/WriterWindowState.xcu +++ b/oxt/Office/UI/WriterWindowState.xcu @@ -7,8 +7,9 @@ - Pokémon GO IV Calculator + Pokémon GO IV Calculator 寶可夢 GO IV 計算機 + Pokémon GO IV Calculator diff --git a/oxt/PokemonGoIV/DialogStrings_de_DE.properties b/oxt/PokemonGoIV/DialogStrings_de_DE.properties new file mode 100644 index 0000000..0ec72a8 --- /dev/null +++ b/oxt/PokemonGoIV/DialogStrings_de_DE.properties @@ -0,0 +1,170 @@ +# Strings for Dialog Library PokemonGoIV +1.DlgMain.Title=Pok\u00e9mon GO IV Calculator +2.DlgMain.txtPokemon.Label=~Pok\u00e9mon: +3.DlgMain.txtCP.Label=~CP: +4.DlgMain.txtHP.Label=~HP: +5.DlgMain.txtStarDust.Label=S~tar dust: +6.DlgMain.txtPlayerLevel.Label=Player ~level: +7.DlgMain.cbxIsNew.Label=This Pok\u00e9mon has ~not been powered-up yet. +8.DlgMain.grpAppraisals.Label=Team Leader Appraisal +9.DlgMain.rdoTeamValor.Label=Team ~Valor +10.DlgMain.rdoTeamMystic.Label=Team ~Mystic +11.DlgMain.rdoTeamInstinct.Label=Team ~Instinct +1001.lstPokemon.StringItemList=Bulbasaur +1002.lstPokemon.StringItemList=Ivysaur +1003.lstPokemon.StringItemList=Venusaur +1004.lstPokemon.StringItemList=Charmander +1005.lstPokemon.StringItemList=Charmeleon +1006.lstPokemon.StringItemList=Charizard +1007.lstPokemon.StringItemList=Squirtle +1008.lstPokemon.StringItemList=Wartortle +1009.lstPokemon.StringItemList=Blastoise +1010.lstPokemon.StringItemList=Caterpie +1011.lstPokemon.StringItemList=Metapod +1012.lstPokemon.StringItemList=Butterfree +1013.lstPokemon.StringItemList=Weedle +1014.lstPokemon.StringItemList=Kakuna +1015.lstPokemon.StringItemList=Beedrill +1016.lstPokemon.StringItemList=Pidgey +1017.lstPokemon.StringItemList=Pidgeotto +1018.lstPokemon.StringItemList=Pidgeot +1019.lstPokemon.StringItemList=Rattata +1020.lstPokemon.StringItemList=Raticate +1021.lstPokemon.StringItemList=Spearow +1022.lstPokemon.StringItemList=Fearow +1023.lstPokemon.StringItemList=Ekans +1024.lstPokemon.StringItemList=Arbok +1025.lstPokemon.StringItemList=Pikachu +1026.lstPokemon.StringItemList=Raichu +1027.lstPokemon.StringItemList=Sandshrew +1028.lstPokemon.StringItemList=Sandslash +1029.lstPokemon.StringItemList=Nidoran\u2640 +1030.lstPokemon.StringItemList=Nidorina +1031.lstPokemon.StringItemList=Nidoqueen +1032.lstPokemon.StringItemList=Nidoran\u2642 +1033.lstPokemon.StringItemList=Nidorino +1034.lstPokemon.StringItemList=Nidoking +1035.lstPokemon.StringItemList=Clefairy +1036.lstPokemon.StringItemList=Clefable +1037.lstPokemon.StringItemList=Vulpix +1038.lstPokemon.StringItemList=Ninetales +1039.lstPokemon.StringItemList=Jigglypuff +1040.lstPokemon.StringItemList=Wigglytuff +1041.lstPokemon.StringItemList=Zubat +1042.lstPokemon.StringItemList=Golbat +1043.lstPokemon.StringItemList=Oddish +1044.lstPokemon.StringItemList=Gloom +1045.lstPokemon.StringItemList=Vileplume +1046.lstPokemon.StringItemList=Paras +1047.lstPokemon.StringItemList=Parasect +1048.lstPokemon.StringItemList=Venonat +1049.lstPokemon.StringItemList=Venomoth +1050.lstPokemon.StringItemList=Diglett +1051.lstPokemon.StringItemList=Dugtrio +1052.lstPokemon.StringItemList=Meowth +1053.lstPokemon.StringItemList=Persian +1054.lstPokemon.StringItemList=Psyduck +1055.lstPokemon.StringItemList=Golduck +1056.lstPokemon.StringItemList=Mankey +1057.lstPokemon.StringItemList=Primeape +1058.lstPokemon.StringItemList=Growlithe +1059.lstPokemon.StringItemList=Arcanine +1060.lstPokemon.StringItemList=Poliwag +1061.lstPokemon.StringItemList=Poliwhirl +1062.lstPokemon.StringItemList=Poliwrath +1063.lstPokemon.StringItemList=Abra +1064.lstPokemon.StringItemList=Kadabra +1065.lstPokemon.StringItemList=Alakazam +1066.lstPokemon.StringItemList=Machop +1067.lstPokemon.StringItemList=Machoke +1068.lstPokemon.StringItemList=Machamp +1069.lstPokemon.StringItemList=Bellsprout +1070.lstPokemon.StringItemList=Weepinbell +1071.lstPokemon.StringItemList=Victreebel +1072.lstPokemon.StringItemList=Tentacool +1073.lstPokemon.StringItemList=Tentacruel +1074.lstPokemon.StringItemList=Geodude +1075.lstPokemon.StringItemList=Graveler +1076.lstPokemon.StringItemList=Golem +1077.lstPokemon.StringItemList=Ponyta +1078.lstPokemon.StringItemList=Rapidash +1079.lstPokemon.StringItemList=Slowpoke +1080.lstPokemon.StringItemList=Slowbro +1081.lstPokemon.StringItemList=Magnemite +1082.lstPokemon.StringItemList=Magneton +1083.lstPokemon.StringItemList=Farfetch'd +1084.lstPokemon.StringItemList=Doduo +1085.lstPokemon.StringItemList=Dodrio +1086.lstPokemon.StringItemList=Seel +1087.lstPokemon.StringItemList=Dewgong +1088.lstPokemon.StringItemList=Grimer +1089.lstPokemon.StringItemList=Muk +1090.lstPokemon.StringItemList=Shellder +1091.lstPokemon.StringItemList=Cloyster +1092.lstPokemon.StringItemList=Gastly +1093.lstPokemon.StringItemList=Haunter +1094.lstPokemon.StringItemList=Gengar +1095.lstPokemon.StringItemList=Onix +1096.lstPokemon.StringItemList=Drowzee +1097.lstPokemon.StringItemList=Hypno +1098.lstPokemon.StringItemList=Krabby +1099.lstPokemon.StringItemList=Kingler +1100.lstPokemon.StringItemList=Voltorb +1101.lstPokemon.StringItemList=Electrode +1102.lstPokemon.StringItemList=Exeggcute +1103.lstPokemon.StringItemList=Exeggutor +1104.lstPokemon.StringItemList=Cubone +1105.lstPokemon.StringItemList=Marowak +1106.lstPokemon.StringItemList=Hitmonlee +1107.lstPokemon.StringItemList=Hitmonchan +1108.lstPokemon.StringItemList=Lickitung +1109.lstPokemon.StringItemList=Koffing +1110.lstPokemon.StringItemList=Weezing +1111.lstPokemon.StringItemList=Rhyhorn +1112.lstPokemon.StringItemList=Rhydon +1113.lstPokemon.StringItemList=Chansey +1114.lstPokemon.StringItemList=Tangela +1115.lstPokemon.StringItemList=Kangaskhan +1116.lstPokemon.StringItemList=Horsea +1117.lstPokemon.StringItemList=Seadra +1118.lstPokemon.StringItemList=Goldeen +1119.lstPokemon.StringItemList=Seaking +1120.lstPokemon.StringItemList=Staryu +1121.lstPokemon.StringItemList=Starmie +1122.lstPokemon.StringItemList=Mr. Mime +1123.lstPokemon.StringItemList=Scyther +1124.lstPokemon.StringItemList=Jynx +1125.lstPokemon.StringItemList=Electabuzz +1126.lstPokemon.StringItemList=Magmar +1127.lstPokemon.StringItemList=Pinsir +1128.lstPokemon.StringItemList=Tauros +1129.lstPokemon.StringItemList=Magikarp +1130.lstPokemon.StringItemList=Gyarados +1131.lstPokemon.StringItemList=Lapras +1132.lstPokemon.StringItemList=Ditto +1133.lstPokemon.StringItemList=Eevee +1134.lstPokemon.StringItemList=Vaporeon +1135.lstPokemon.StringItemList=Jolteon +1136.lstPokemon.StringItemList=Flareon +1137.lstPokemon.StringItemList=Porygon +1138.lstPokemon.StringItemList=Omanyte +1139.lstPokemon.StringItemList=Omastar +1140.lstPokemon.StringItemList=Kabuto +1141.lstPokemon.StringItemList=Kabutops +1142.lstPokemon.StringItemList=Aerodactyl +1143.lstPokemon.StringItemList=Snorlax +1144.lstPokemon.StringItemList=Articuno +1145.lstPokemon.StringItemList=Zapdos +1146.lstPokemon.StringItemList=Moltres +1147.lstPokemon.StringItemList=Dratini +1148.lstPokemon.StringItemList=Dragonair +1149.lstPokemon.StringItemList=Dragonite +1150.lstPokemon.StringItemList=Mewtwo +1151.lstPokemon.StringItemList=Mew +1172.lstPokemon.StringItemList=Pichu +1173.lstPokemon.StringItemList=Cleffa +1174.lstPokemon.StringItemList=Igglybuff +1175.lstPokemon.StringItemList=Togepi +1176.lstPokemon.StringItemList=Togetic +1238.lstPokemon.StringItemList=Smoochum +1239.lstPokemon.StringItemList=Elekid diff --git a/oxt/description.xml b/oxt/description.xml index 013a08d..5bff29e 100644 --- a/oxt/description.xml +++ b/oxt/description.xml @@ -20,6 +20,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 + Pokémon GO IV Calculator diff --git a/oxt/pkg-desc/pkg-description.de-DE.txt b/oxt/pkg-desc/pkg-description.de-DE.txt new file mode 100644 index 0000000..03b69c3 --- /dev/null +++ b/oxt/pkg-desc/pkg-description.de-DE.txt @@ -0,0 +1,4 @@ +PokemonGoIV - Pokémon GO IV Calculator +Copyright (c) 2016 imacat + +Calculates the individual values (IVs) of the Pokémon. From b8259303fa4d890ef5ffd2a86f5a6aa8a6b39b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Wed, 15 Feb 2017 17:04:32 +0800 Subject: [PATCH 02/10] Updated the copyright year. --- PokemonGoIV/0Main.vb | 2 +- PokemonGoIV/1Data.vb | 2 +- PokemonGoIV/9Load.vb | 4 ++-- README | 2 +- oxt/PokemonGoIV/0Main.xba | 2 +- oxt/PokemonGoIV/1Data.xba | 2 +- oxt/PokemonGoIV/9Load.xba | 4 ++-- oxt/pkg-desc/pkg-description.de-DE.txt | 2 +- oxt/pkg-desc/pkg-description.txt | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/PokemonGoIV/0Main.vb b/PokemonGoIV/0Main.vb index 5c1e717..ad56ebf 100644 --- a/PokemonGoIV/0Main.vb +++ b/PokemonGoIV/0Main.vb @@ -1,4 +1,4 @@ -' Copyright (c) 2016 imacat. +' Copyright (c) 2016-2017 imacat. ' ' Licensed under the Apache License, Version 2.0 (the "License"); ' you may not use this file except in compliance with the License. diff --git a/PokemonGoIV/1Data.vb b/PokemonGoIV/1Data.vb index 2bd349f..eb4ec37 100644 --- a/PokemonGoIV/1Data.vb +++ b/PokemonGoIV/1Data.vb @@ -1,4 +1,4 @@ -' Copyright (c) 2016 imacat. +' Copyright (c) 2016-2017 imacat. ' ' Licensed under the Apache License, Version 2.0 (the "License"); ' you may not use this file except in compliance with the License. diff --git a/PokemonGoIV/9Load.vb b/PokemonGoIV/9Load.vb index 72ad364..cb0c6b7 100644 --- a/PokemonGoIV/9Load.vb +++ b/PokemonGoIV/9Load.vb @@ -1,4 +1,4 @@ -' Copyright (c) 2016 imacat. +' Copyright (c) 2016-2017 imacat. ' ' Licensed under the Apache License, Version 2.0 (the "License"); ' you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ Sub subReadDataSheets Dim sOutput as String, mData As Variant sOutput = "" _ - & "' Copyright (c) 2016 imacat." & Chr (10) _ + & "' Copyright (c) 2016-" & Year (Now) & " imacat." & Chr (10) _ & "' " & Chr (10) _ & "' Licensed under the Apache License, Version 2.0 (the ""License"");" & Chr (10) _ & "' you may not use this file except in compliance with the License." & Chr (10) _ diff --git a/README b/README index 850cb24..a2c2455 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ pokemongoiv - The Pokémon GO IV calculator - Copyright (c) 2016 imacat. + Copyright (c) 2016-2017 imacat. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/oxt/PokemonGoIV/0Main.xba b/oxt/PokemonGoIV/0Main.xba index 6376074..ee3189a 100644 --- a/oxt/PokemonGoIV/0Main.xba +++ b/oxt/PokemonGoIV/0Main.xba @@ -1,6 +1,6 @@ -' Copyright (c) 2016 imacat. +' Copyright (c) 2016-2017 imacat. ' ' Licensed under the Apache License, Version 2.0 (the "License"); ' you may not use this file except in compliance with the License. diff --git a/oxt/PokemonGoIV/1Data.xba b/oxt/PokemonGoIV/1Data.xba index 464af50..8cd76b8 100644 --- a/oxt/PokemonGoIV/1Data.xba +++ b/oxt/PokemonGoIV/1Data.xba @@ -1,6 +1,6 @@ -' Copyright (c) 2016 imacat. +' Copyright (c) 2016-2017 imacat. ' ' Licensed under the Apache License, Version 2.0 (the "License"); ' you may not use this file except in compliance with the License. diff --git a/oxt/PokemonGoIV/9Load.xba b/oxt/PokemonGoIV/9Load.xba index f2e8ce9..fc60d53 100644 --- a/oxt/PokemonGoIV/9Load.xba +++ b/oxt/PokemonGoIV/9Load.xba @@ -1,6 +1,6 @@ -' Copyright (c) 2016 imacat. +' Copyright (c) 2016-2017 imacat. ' ' Licensed under the Apache License, Version 2.0 (the "License"); ' you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ Sub subReadDataSheets Dim sOutput as String, mData As Variant sOutput = "" _ - & "' Copyright (c) 2016 imacat." & Chr (10) _ + & "' Copyright (c) 2016-" & Year (Now) & " imacat." & Chr (10) _ & "' " & Chr (10) _ & "' Licensed under the Apache License, Version 2.0 (the ""License"");" & Chr (10) _ & "' you may not use this file except in compliance with the License." & Chr (10) _ diff --git a/oxt/pkg-desc/pkg-description.de-DE.txt b/oxt/pkg-desc/pkg-description.de-DE.txt index 03b69c3..4a97d56 100644 --- a/oxt/pkg-desc/pkg-description.de-DE.txt +++ b/oxt/pkg-desc/pkg-description.de-DE.txt @@ -1,4 +1,4 @@ PokemonGoIV - Pokémon GO IV Calculator -Copyright (c) 2016 imacat +Copyright (c) 2016-2017 imacat Calculates the individual values (IVs) of the Pokémon. diff --git a/oxt/pkg-desc/pkg-description.txt b/oxt/pkg-desc/pkg-description.txt index 03b69c3..4a97d56 100644 --- a/oxt/pkg-desc/pkg-description.txt +++ b/oxt/pkg-desc/pkg-description.txt @@ -1,4 +1,4 @@ PokemonGoIV - Pokémon GO IV Calculator -Copyright (c) 2016 imacat +Copyright (c) 2016-2017 imacat Calculates the individual values (IVs) of the Pokémon. From 8d5e4777842737b7a54151f3b190c713d5c7e4d3 Mon Sep 17 00:00:00 2001 From: Andreas Frisch Date: Wed, 15 Feb 2017 12:55:22 +0100 Subject: [PATCH 03/10] Add #240 Magby --- oxt/PokemonGoIV/DialogStrings_en_US.properties | 1 + oxt/PokemonGoIV/DialogStrings_zh_TW.properties | 1 + 2 files changed, 2 insertions(+) diff --git a/oxt/PokemonGoIV/DialogStrings_en_US.properties b/oxt/PokemonGoIV/DialogStrings_en_US.properties index 0ec72a8..228c244 100644 --- a/oxt/PokemonGoIV/DialogStrings_en_US.properties +++ b/oxt/PokemonGoIV/DialogStrings_en_US.properties @@ -168,3 +168,4 @@ 1176.lstPokemon.StringItemList=Togetic 1238.lstPokemon.StringItemList=Smoochum 1239.lstPokemon.StringItemList=Elekid +1240.lstPokemon.StringItemList=Magby diff --git a/oxt/PokemonGoIV/DialogStrings_zh_TW.properties b/oxt/PokemonGoIV/DialogStrings_zh_TW.properties index fa1d90b..c9be928 100644 --- a/oxt/PokemonGoIV/DialogStrings_zh_TW.properties +++ b/oxt/PokemonGoIV/DialogStrings_zh_TW.properties @@ -168,3 +168,4 @@ 1176.lstPokemon.StringItemList=Togetic 1238.lstPokemon.StringItemList=Smoochum 1239.lstPokemon.StringItemList=Elekid +1240.lstPokemon.StringItemList=Magby From df06388e8386d40c9c849918bd97fd59b2d1d4a7 Mon Sep 17 00:00:00 2001 From: Andreas Frisch Date: Wed, 15 Feb 2017 12:56:41 +0100 Subject: [PATCH 04/10] add Deutsch (German) translation --- oxt/AddonConfiguration.xcu | 78 ++-- oxt/Addons.xcu | 6 +- oxt/Office/UI/BaseWindowState.xcu | 2 +- oxt/Office/UI/BasicIDEWindowState.xcu | 2 +- oxt/Office/UI/CalcWindowState.xcu | 2 +- oxt/Office/UI/DrawWindowState.xcu | 2 +- oxt/Office/UI/ImpressWindowState.xcu | 2 +- oxt/Office/UI/MathWindowState.xcu | 2 +- oxt/Office/UI/StartModuleWindowState.xcu | 2 +- oxt/Office/UI/WriterWindowState.xcu | 2 +- .../DialogStrings_de_DE.properties | 340 +++++++++++------- oxt/description.xml | 2 +- oxt/pkg-desc/pkg-description.de-DE.txt | 2 +- 13 files changed, 263 insertions(+), 181 deletions(-) diff --git a/oxt/AddonConfiguration.xcu b/oxt/AddonConfiguration.xcu index 1a1ce0b..f901904 100644 --- a/oxt/AddonConfiguration.xcu +++ b/oxt/AddonConfiguration.xcu @@ -10,7 +10,7 @@ Calculates the individual values (IVs) of the Pokémon. 計算寶可夢的 IV 值。 - Calculates the individual values (IVs) of the Pokémon. + Berechnet Individuelle Werte (IVs) von Pokémon. @VERSION@ @@ -37,7 +37,7 @@ Andreas Frisch - andreas@repairfox.de + github@dreambox.guru German @@ -52,25 +52,25 @@ Found no matching IV. 找不出符合的 IV 值。 - Found no matching IV. + Keine passenden individuellen Werte gefunden. Attack - Attack + Angriff Defense - Defense + Verteidigung HP - HP + KP @@ -78,67 +78,67 @@ Candela, leader of Team Valor, says: Valor 隊隊長 Candela 說： - Candela, leader of Team Valor, says: + Candela, Leiter von Team Wagemut, sagt: Overall, your [Pokémon] simply amazes me. It can accomplish anything! - Overall, your [Pokémon] simply amazes me. It can accomplish anything! + Von deinem [Pokémon] bin ich insgesamt total beeindruckt. Es kann einfach alles! Overall, your [Pokémon] is a strong Pokémon. You should be proud! - Overall, your [Pokémon] is a strong Pokémon. You should be proud! + Dein [Pokémon] ist insgesamt sehr stark. Du kannst stolz sein! Overall, your [Pokémon] is a decent Pokémon. - Overall, your [Pokémon] is a decent Pokémon. + Dein [Pokémon] ist insgesamt ganz gut! Overall, your [Pokémon] may not be great in battle, but I still like it! - Overall, your [Pokémon] may not be great in battle, but I still like it! + Dein [Pokémon] ist zwar insgesamt im Kampf nicht allzu beeindruckend, aber ich mag es trotzdem! Its [Stat] is its strongest feature. - Its [Stat] is its strongest feature. + Sein [Stat]-Wert ist seine stärkste Eigenschaft. I'm just as impressed with its [Stat]. - I'm just as impressed with its [Stat]. + Ich bin genauso beeindruckt durch seinen [Stat]-Wert. I'm blown away by its stats. WOW! - I'm blown away by its stats. WOW! + Seine Werte hauen mich um. WOW! It's got excellent stats! How exciting! - It's got excellent stats! How exciting! + Es hat hervorragende Werte! Wie aufregend! Its stats indicate that in battle, it'll get the job done. - Its stats indicate that in battle, it'll get the job done. + Seine Werte sind nicht von schlechten Eltern. Its stats don't point to greatness in battle. - Its stats don't point to greatness in battle. + Seine Werte werden dir im Kampf nicht viel bringen. @@ -146,67 +146,67 @@ Blanche, leader of Team Mystic, says: Mystic 隊隊長 Blanche 說： - Blanche, leader of Team Mystic, says: + Blanche, Leiter von Team Weisheit, sagt: Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon! - Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon! + Dein [Pokémon] ist insgesamt einfach erstaunlich. Wirklich ein atemberaubendes Exemplar! Overall, your [Pokémon] has certainly caught my attention. - Overall, your [Pokémon] has certainly caught my attention. + Dein [Pokémon] ist mir insgesamt wirklich aufgefallen. Overall, your [Pokémon] is above average. - Overall, your [Pokémon] is above average. + Dein [Pokémon] ist insgesamt ein gutes Pokémon. Overall, your [Pokémon] is not likely to make much headway in battle. - Overall, your [Pokémon] is not likely to make much headway in battle. + Dein [Pokémon] wird im Kampf insgesamt wahrscheinlich keine großen Fortschritte machen. I see that its best attribute is its [Stat]. - I see that its best attribute is its [Stat]. + Seine beste Eigenschaft ist offensichtlich sein [Stat]-Wert. It is matched equally by its [Stat]. - It is matched equally by its [Stat]. + Sein [Stat]-Wert ist genauso gut! Its stats exceed my calculations. It's incredible! - Its stats exceed my calculations. It's incredible! + Seine Werte sind so hoch, dass ich sie gar nicht berechnen kann! Unglaublich! I am certainly impressed by its stats, I must say. - I am certainly impressed by its stats, I must say. + Ich muss sagen, dass ich von seinen Werten sehr beeindruckt bin. Its stats are noticeably trending to the positive. - Its stats are noticeably trending to the positive. + Seine Werte sind recht beeindruckend. Its stats are not out of the norm, in my opinion. - Its stats are not out of the norm, in my opinion. + Seine Werte sind insgesamt ganz ok. @@ -214,67 +214,67 @@ Spark, leader of Team Instinct, says: Instinct 隊隊長 Spark 說： - Spark, leader of Team Instinct, says: + Spark, Leiter von Team Intuition, sagt: Overall, your [Pokémon] is not likely to make much headway in battle. - Overall, your [Pokémon] is not likely to make much headway in battle. + Dein [Pokémon] kann es im Kampf mit allen aufnehmen! Overall, your [Pokémon] is really strong! - Overall, your [Pokémon] is really strong! + Dein [Pokémon] ist insgesamt wirklich stark! Overall, your [Pokémon] is pretty decent! - Overall, your [Pokémon] is pretty decent! + Dein [Pokémon] ist insgesamt ganz gut. Overall, your [Pokémon] has room for improvement as far as battling goes. - Overall, your [Pokémon] has room for improvement as far as battling goes. + Dein [Pokémon] kann sich im Kampf noch verbessern! Its best quality is [Stat]. - Its best quality is [Stat]. + Sein [Stat]-Wert ist seine beste Eigenschaft! Its [Stat] is great, too! - Its [Stat] is great, too! + Auch sein [Stat]-Wert ist klasse! Its stats are the best I've ever seen! No doubt about it! - Its stats are the best I've ever seen! No doubt about it! + Seine Werte sind die besten, die ich je gesehen habe! Its stats are really strong! Impressive. - Its stats are really strong! Impressive. + Seine Werte sind wirklich hoch! Hut ab! It's definitely got some good stats. Definitely! - It's definitely got some good stats. Definitely! + Seine Werte können sich sehen lassen! Its stats are all right, but kinda basic, as far as I can see. - Its stats are all right, but kinda basic, as far as I can see. + Seine Werte sind okay. diff --git a/oxt/Addons.xcu b/oxt/Addons.xcu index 02d7bde..a5e4a68 100644 --- a/oxt/Addons.xcu +++ b/oxt/Addons.xcu @@ -11,7 +11,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Calculator + Pokémon GO IV Rechner @@ -27,7 +27,7 @@ Calculates Pokémon IV 計算寶可夢 IV - Calculates Pokémon IV + Berechnet IV von Pokémon _self @@ -49,7 +49,7 @@ Calculates Pokémon IV 計算寶可夢 IV - Calculates Pokémon IV + Berechnet IV von Pokémon _self diff --git a/oxt/Office/UI/BaseWindowState.xcu b/oxt/Office/UI/BaseWindowState.xcu index 9ff1b11..da164f4 100644 --- a/oxt/Office/UI/BaseWindowState.xcu +++ b/oxt/Office/UI/BaseWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Calculator + Pokémon GO IV Rechner diff --git a/oxt/Office/UI/BasicIDEWindowState.xcu b/oxt/Office/UI/BasicIDEWindowState.xcu index 639d74c..4ef94d4 100644 --- a/oxt/Office/UI/BasicIDEWindowState.xcu +++ b/oxt/Office/UI/BasicIDEWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Calculator + Pokémon GO IV Rechner diff --git a/oxt/Office/UI/CalcWindowState.xcu b/oxt/Office/UI/CalcWindowState.xcu index 0e28e97..c145c78 100644 --- a/oxt/Office/UI/CalcWindowState.xcu +++ b/oxt/Office/UI/CalcWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Calculator + Pokémon GO IV Rechner diff --git a/oxt/Office/UI/DrawWindowState.xcu b/oxt/Office/UI/DrawWindowState.xcu index 4713186..44cd82e 100644 --- a/oxt/Office/UI/DrawWindowState.xcu +++ b/oxt/Office/UI/DrawWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Calculator + Pokémon GO IV Rechner diff --git a/oxt/Office/UI/ImpressWindowState.xcu b/oxt/Office/UI/ImpressWindowState.xcu index 93aea78..681713b 100644 --- a/oxt/Office/UI/ImpressWindowState.xcu +++ b/oxt/Office/UI/ImpressWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Calculator + Pokémon GO IV Rechner diff --git a/oxt/Office/UI/MathWindowState.xcu b/oxt/Office/UI/MathWindowState.xcu index 4f52357..6fd2d33 100644 --- a/oxt/Office/UI/MathWindowState.xcu +++ b/oxt/Office/UI/MathWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Calculator + Pokémon GO IV Rechner diff --git a/oxt/Office/UI/StartModuleWindowState.xcu b/oxt/Office/UI/StartModuleWindowState.xcu index 4d2cfed..a2f0e7e 100644 --- a/oxt/Office/UI/StartModuleWindowState.xcu +++ b/oxt/Office/UI/StartModuleWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Calculator + Pokémon GO IV Rechner diff --git a/oxt/Office/UI/WriterWindowState.xcu b/oxt/Office/UI/WriterWindowState.xcu index 4d99555..e167532 100644 --- a/oxt/Office/UI/WriterWindowState.xcu +++ b/oxt/Office/UI/WriterWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Calculator + Pokémon GO IV Rechner diff --git a/oxt/PokemonGoIV/DialogStrings_de_DE.properties b/oxt/PokemonGoIV/DialogStrings_de_DE.properties index 0ec72a8..525ebf4 100644 --- a/oxt/PokemonGoIV/DialogStrings_de_DE.properties +++ b/oxt/PokemonGoIV/DialogStrings_de_DE.properties @@ -1,170 +1,252 @@ # Strings for Dialog Library PokemonGoIV -1.DlgMain.Title=Pok\u00e9mon GO IV Calculator +1.DlgMain.Title=Pok\u00e9mon GO IV Rechner 2.DlgMain.txtPokemon.Label=~Pok\u00e9mon: -3.DlgMain.txtCP.Label=~CP: -4.DlgMain.txtHP.Label=~HP: -5.DlgMain.txtStarDust.Label=S~tar dust: -6.DlgMain.txtPlayerLevel.Label=Player ~level: -7.DlgMain.cbxIsNew.Label=This Pok\u00e9mon has ~not been powered-up yet. -8.DlgMain.grpAppraisals.Label=Team Leader Appraisal -9.DlgMain.rdoTeamValor.Label=Team ~Valor -10.DlgMain.rdoTeamMystic.Label=Team ~Mystic -11.DlgMain.rdoTeamInstinct.Label=Team ~Instinct -1001.lstPokemon.StringItemList=Bulbasaur -1002.lstPokemon.StringItemList=Ivysaur -1003.lstPokemon.StringItemList=Venusaur -1004.lstPokemon.StringItemList=Charmander -1005.lstPokemon.StringItemList=Charmeleon -1006.lstPokemon.StringItemList=Charizard -1007.lstPokemon.StringItemList=Squirtle -1008.lstPokemon.StringItemList=Wartortle -1009.lstPokemon.StringItemList=Blastoise -1010.lstPokemon.StringItemList=Caterpie -1011.lstPokemon.StringItemList=Metapod -1012.lstPokemon.StringItemList=Butterfree -1013.lstPokemon.StringItemList=Weedle -1014.lstPokemon.StringItemList=Kakuna -1015.lstPokemon.StringItemList=Beedrill -1016.lstPokemon.StringItemList=Pidgey -1017.lstPokemon.StringItemList=Pidgeotto -1018.lstPokemon.StringItemList=Pidgeot -1019.lstPokemon.StringItemList=Rattata -1020.lstPokemon.StringItemList=Raticate -1021.lstPokemon.StringItemList=Spearow -1022.lstPokemon.StringItemList=Fearow -1023.lstPokemon.StringItemList=Ekans +3.DlgMain.txtCP.Label=~WP: +4.DlgMain.txtHP.Label=~KP: +5.DlgMain.txtStarDust.Label=~Sternenstaub: +6.DlgMain.txtPlayerLevel.Label=Spieler ~Level: +7.DlgMain.cbxIsNew.Label=Dieses Pok\u00e9mon hat noch ~kein Power-Up bekommen. +8.DlgMain.grpAppraisals.Label=Bewertung des Teamleiters +9.DlgMain.rdoTeamValor.Label=Team W~agemut +10.DlgMain.rdoTeamMystic.Label=Team W~eisheit +11.DlgMain.rdoTeamInstinct.Label=Team ~Intuition +1001.lstPokemon.StringItemList=Bisasam +1002.lstPokemon.StringItemList=Bisaknosp +1003.lstPokemon.StringItemList=Bisaflor +1004.lstPokemon.StringItemList=Glumanda +1005.lstPokemon.StringItemList=Glutexo +1006.lstPokemon.StringItemList=Glurak +1007.lstPokemon.StringItemList=Schiggy +1008.lstPokemon.StringItemList=Schillok +1009.lstPokemon.StringItemList=Turtok +1010.lstPokemon.StringItemList=Raupy +1011.lstPokemon.StringItemList=Safcon +1012.lstPokemon.StringItemList=Smettbo +1013.lstPokemon.StringItemList=Hornliu +1014.lstPokemon.StringItemList=Kokuna +1015.lstPokemon.StringItemList=Bibor +1016.lstPokemon.StringItemList=Taubsi +1017.lstPokemon.StringItemList=Tauboga +1018.lstPokemon.StringItemList=Tauboss +1019.lstPokemon.StringItemList=Rattfratz +1020.lstPokemon.StringItemList=Rattikarl +1021.lstPokemon.StringItemList=Habitak +1022.lstPokemon.StringItemList=Ibitak +1023.lstPokemon.StringItemList=Rettan 1024.lstPokemon.StringItemList=Arbok 1025.lstPokemon.StringItemList=Pikachu 1026.lstPokemon.StringItemList=Raichu -1027.lstPokemon.StringItemList=Sandshrew -1028.lstPokemon.StringItemList=Sandslash +1027.lstPokemon.StringItemList=Sandan +1028.lstPokemon.StringItemList=Sandamer 1029.lstPokemon.StringItemList=Nidoran\u2640 1030.lstPokemon.StringItemList=Nidorina 1031.lstPokemon.StringItemList=Nidoqueen 1032.lstPokemon.StringItemList=Nidoran\u2642 1033.lstPokemon.StringItemList=Nidorino 1034.lstPokemon.StringItemList=Nidoking -1035.lstPokemon.StringItemList=Clefairy -1036.lstPokemon.StringItemList=Clefable +1035.lstPokemon.StringItemList=Piepi +1036.lstPokemon.StringItemList=Pixi 1037.lstPokemon.StringItemList=Vulpix -1038.lstPokemon.StringItemList=Ninetales -1039.lstPokemon.StringItemList=Jigglypuff -1040.lstPokemon.StringItemList=Wigglytuff +1038.lstPokemon.StringItemList=Vulnona +1039.lstPokemon.StringItemList=Pummeluff +1040.lstPokemon.StringItemList=Knuddeluff 1041.lstPokemon.StringItemList=Zubat 1042.lstPokemon.StringItemList=Golbat -1043.lstPokemon.StringItemList=Oddish -1044.lstPokemon.StringItemList=Gloom -1045.lstPokemon.StringItemList=Vileplume +1043.lstPokemon.StringItemList=Myrapla +1044.lstPokemon.StringItemList=Duflor +1045.lstPokemon.StringItemList=Giflor 1046.lstPokemon.StringItemList=Paras -1047.lstPokemon.StringItemList=Parasect -1048.lstPokemon.StringItemList=Venonat -1049.lstPokemon.StringItemList=Venomoth -1050.lstPokemon.StringItemList=Diglett -1051.lstPokemon.StringItemList=Dugtrio -1052.lstPokemon.StringItemList=Meowth -1053.lstPokemon.StringItemList=Persian -1054.lstPokemon.StringItemList=Psyduck -1055.lstPokemon.StringItemList=Golduck -1056.lstPokemon.StringItemList=Mankey -1057.lstPokemon.StringItemList=Primeape -1058.lstPokemon.StringItemList=Growlithe -1059.lstPokemon.StringItemList=Arcanine -1060.lstPokemon.StringItemList=Poliwag -1061.lstPokemon.StringItemList=Poliwhirl -1062.lstPokemon.StringItemList=Poliwrath +1047.lstPokemon.StringItemList=Parasek +1048.lstPokemon.StringItemList=Bluzuk +1049.lstPokemon.StringItemList=Omot +1050.lstPokemon.StringItemList=Digda +1051.lstPokemon.StringItemList=Digdri +1052.lstPokemon.StringItemList=Mauzi +1053.lstPokemon.StringItemList=Snobilikat +1054.lstPokemon.StringItemList=Enton +1055.lstPokemon.StringItemList=Entoron +1056.lstPokemon.StringItemList=Menki +1057.lstPokemon.StringItemList=Rasaff +1058.lstPokemon.StringItemList=Fukano +1059.lstPokemon.StringItemList=Arkani +1060.lstPokemon.StringItemList=Quapsel +1061.lstPokemon.StringItemList=Quaputzi +1062.lstPokemon.StringItemList=Quappo 1063.lstPokemon.StringItemList=Abra 1064.lstPokemon.StringItemList=Kadabra -1065.lstPokemon.StringItemList=Alakazam -1066.lstPokemon.StringItemList=Machop -1067.lstPokemon.StringItemList=Machoke -1068.lstPokemon.StringItemList=Machamp -1069.lstPokemon.StringItemList=Bellsprout -1070.lstPokemon.StringItemList=Weepinbell -1071.lstPokemon.StringItemList=Victreebel -1072.lstPokemon.StringItemList=Tentacool -1073.lstPokemon.StringItemList=Tentacruel -1074.lstPokemon.StringItemList=Geodude -1075.lstPokemon.StringItemList=Graveler -1076.lstPokemon.StringItemList=Golem -1077.lstPokemon.StringItemList=Ponyta -1078.lstPokemon.StringItemList=Rapidash -1079.lstPokemon.StringItemList=Slowpoke -1080.lstPokemon.StringItemList=Slowbro -1081.lstPokemon.StringItemList=Magnemite +1065.lstPokemon.StringItemList=Simsala +1066.lstPokemon.StringItemList=Machollo +1067.lstPokemon.StringItemList=Maschock +1068.lstPokemon.StringItemList=Machomei +1069.lstPokemon.StringItemList=Knofensa +1070.lstPokemon.StringItemList=Ultrigaria +1071.lstPokemon.StringItemList=Sarzenia +1072.lstPokemon.StringItemList=Tentacha +1073.lstPokemon.StringItemList=Tentoxa +1074.lstPokemon.StringItemList=Kleinstein +1075.lstPokemon.StringItemList=Georok +1076.lstPokemon.StringItemList=Geowaz +1077.lstPokemon.StringItemList=Ponita +1078.lstPokemon.StringItemList=Gallopa +1079.lstPokemon.StringItemList=Flegmon +1080.lstPokemon.StringItemList=Lahmus +1081.lstPokemon.StringItemList=Magnetilo 1082.lstPokemon.StringItemList=Magneton -1083.lstPokemon.StringItemList=Farfetch'd -1084.lstPokemon.StringItemList=Doduo -1085.lstPokemon.StringItemList=Dodrio -1086.lstPokemon.StringItemList=Seel -1087.lstPokemon.StringItemList=Dewgong -1088.lstPokemon.StringItemList=Grimer -1089.lstPokemon.StringItemList=Muk -1090.lstPokemon.StringItemList=Shellder -1091.lstPokemon.StringItemList=Cloyster -1092.lstPokemon.StringItemList=Gastly -1093.lstPokemon.StringItemList=Haunter +1083.lstPokemon.StringItemList=Porenta +1084.lstPokemon.StringItemList=Dodu +1085.lstPokemon.StringItemList=Dodri +1086.lstPokemon.StringItemList=Jurob +1087.lstPokemon.StringItemList=Jugong +1088.lstPokemon.StringItemList=Sleima +1089.lstPokemon.StringItemList=Sleimok +1090.lstPokemon.StringItemList=Muschas +1091.lstPokemon.StringItemList=Austos +1092.lstPokemon.StringItemList=Nebulak +1093.lstPokemon.StringItemList=Alpollo 1094.lstPokemon.StringItemList=Gengar 1095.lstPokemon.StringItemList=Onix -1096.lstPokemon.StringItemList=Drowzee +1096.lstPokemon.StringItemList=Traumato 1097.lstPokemon.StringItemList=Hypno 1098.lstPokemon.StringItemList=Krabby 1099.lstPokemon.StringItemList=Kingler -1100.lstPokemon.StringItemList=Voltorb -1101.lstPokemon.StringItemList=Electrode -1102.lstPokemon.StringItemList=Exeggcute -1103.lstPokemon.StringItemList=Exeggutor -1104.lstPokemon.StringItemList=Cubone -1105.lstPokemon.StringItemList=Marowak -1106.lstPokemon.StringItemList=Hitmonlee -1107.lstPokemon.StringItemList=Hitmonchan -1108.lstPokemon.StringItemList=Lickitung -1109.lstPokemon.StringItemList=Koffing -1110.lstPokemon.StringItemList=Weezing -1111.lstPokemon.StringItemList=Rhyhorn -1112.lstPokemon.StringItemList=Rhydon -1113.lstPokemon.StringItemList=Chansey +1100.lstPokemon.StringItemList=Voltobal +1101.lstPokemon.StringItemList=Lektrobal +1102.lstPokemon.StringItemList=Owei +1103.lstPokemon.StringItemList=Kokowei +1104.lstPokemon.StringItemList=Tragosso +1105.lstPokemon.StringItemList=Knogga +1106.lstPokemon.StringItemList=Kicklee +1107.lstPokemon.StringItemList=Nockchan +1108.lstPokemon.StringItemList=Schlurp +1109.lstPokemon.StringItemList=Smogon +1110.lstPokemon.StringItemList=Smogmog +1111.lstPokemon.StringItemList=Rihorn +1112.lstPokemon.StringItemList=Rizeros +1113.lstPokemon.StringItemList=Chaneira 1114.lstPokemon.StringItemList=Tangela -1115.lstPokemon.StringItemList=Kangaskhan -1116.lstPokemon.StringItemList=Horsea -1117.lstPokemon.StringItemList=Seadra -1118.lstPokemon.StringItemList=Goldeen -1119.lstPokemon.StringItemList=Seaking -1120.lstPokemon.StringItemList=Staryu +1115.lstPokemon.StringItemList=Kangama +1116.lstPokemon.StringItemList=Seeper +1117.lstPokemon.StringItemList=Seemon +1118.lstPokemon.StringItemList=Goldini +1119.lstPokemon.StringItemList=Golking +1120.lstPokemon.StringItemList=Sterndu 1121.lstPokemon.StringItemList=Starmie -1122.lstPokemon.StringItemList=Mr. Mime -1123.lstPokemon.StringItemList=Scyther -1124.lstPokemon.StringItemList=Jynx -1125.lstPokemon.StringItemList=Electabuzz +1122.lstPokemon.StringItemList=Pantimos +1123.lstPokemon.StringItemList=Sichlor +1124.lstPokemon.StringItemList=Rossana +1125.lstPokemon.StringItemList=Elektek 1126.lstPokemon.StringItemList=Magmar 1127.lstPokemon.StringItemList=Pinsir 1128.lstPokemon.StringItemList=Tauros -1129.lstPokemon.StringItemList=Magikarp -1130.lstPokemon.StringItemList=Gyarados +1129.lstPokemon.StringItemList=Karpador +1130.lstPokemon.StringItemList=Garados 1131.lstPokemon.StringItemList=Lapras 1132.lstPokemon.StringItemList=Ditto -1133.lstPokemon.StringItemList=Eevee -1134.lstPokemon.StringItemList=Vaporeon -1135.lstPokemon.StringItemList=Jolteon -1136.lstPokemon.StringItemList=Flareon +1133.lstPokemon.StringItemList=Evoli +1134.lstPokemon.StringItemList=Aquana +1135.lstPokemon.StringItemList=Blitza +1136.lstPokemon.StringItemList=Flamara 1137.lstPokemon.StringItemList=Porygon -1138.lstPokemon.StringItemList=Omanyte -1139.lstPokemon.StringItemList=Omastar +1138.lstPokemon.StringItemList=Amonitas +1139.lstPokemon.StringItemList=Amoroso 1140.lstPokemon.StringItemList=Kabuto 1141.lstPokemon.StringItemList=Kabutops 1142.lstPokemon.StringItemList=Aerodactyl -1143.lstPokemon.StringItemList=Snorlax -1144.lstPokemon.StringItemList=Articuno +1143.lstPokemon.StringItemList=Relaxo +1144.lstPokemon.StringItemList=Arktos 1145.lstPokemon.StringItemList=Zapdos -1146.lstPokemon.StringItemList=Moltres +1146.lstPokemon.StringItemList=Lavados 1147.lstPokemon.StringItemList=Dratini -1148.lstPokemon.StringItemList=Dragonair -1149.lstPokemon.StringItemList=Dragonite -1150.lstPokemon.StringItemList=Mewtwo +1148.lstPokemon.StringItemList=Dragonir +1149.lstPokemon.StringItemList=Dragoran +1150.lstPokemon.StringItemList=Mewtu 1151.lstPokemon.StringItemList=Mew +1152.lstPokemon.StringItemList=Endivie +1153.lstPokemon.StringItemList=Lorblatt +1154.lstPokemon.StringItemList=Meganie +1155.lstPokemon.StringItemList=Feurigel +1156.lstPokemon.StringItemList=Igelavar +1157.lstPokemon.StringItemList=Tornupto +1158.lstPokemon.StringItemList=Karnimani +1159.lstPokemon.StringItemList=Tyracroc +1160.lstPokemon.StringItemList=Impergator +1161.lstPokemon.StringItemList=Wiesor +1162.lstPokemon.StringItemList=Wiesenior +1163.lstPokemon.StringItemList=Hoothoot +1164.lstPokemon.StringItemList=Noctuh +1165.lstPokemon.StringItemList=Ledyba +1166.lstPokemon.StringItemList=Ledian +1167.lstPokemon.StringItemList=Webarak +1168.lstPokemon.StringItemList=Ariados +1169.lstPokemon.StringItemList=Iksbat +1170.lstPokemon.StringItemList=Lampi +1171.lstPokemon.StringItemList=Lanturn 1172.lstPokemon.StringItemList=Pichu -1173.lstPokemon.StringItemList=Cleffa -1174.lstPokemon.StringItemList=Igglybuff +1173.lstPokemon.StringItemList=Pii +1174.lstPokemon.StringItemList=Fluffeluff 1175.lstPokemon.StringItemList=Togepi 1176.lstPokemon.StringItemList=Togetic -1238.lstPokemon.StringItemList=Smoochum +1177.lstPokemon.StringItemList=Natu +1178.lstPokemon.StringItemList=Xatu +1179.lstPokemon.StringItemList=Voltilamm +1180.lstPokemon.StringItemList=Waaty +1181.lstPokemon.StringItemList=Ampharos +1182.lstPokemon.StringItemList=Blubella +1183.lstPokemon.StringItemList=Marill +1184.lstPokemon.StringItemList=Azumarill +1185.lstPokemon.StringItemList=Mogelbaum +1186.lstPokemon.StringItemList=Quaxo +1187.lstPokemon.StringItemList=Hoppspross +1188.lstPokemon.StringItemList=Hubelupf +1189.lstPokemon.StringItemList=Papungha +1190.lstPokemon.StringItemList=Griffel +1191.lstPokemon.StringItemList=Sonnkern +1192.lstPokemon.StringItemList=Sonnflora +1193.lstPokemon.StringItemList=Yanma +1194.lstPokemon.StringItemList=Felino +1195.lstPokemon.StringItemList=Morlord +1196.lstPokemon.StringItemList=Psiana +1197.lstPokemon.StringItemList=Nachtara +1198.lstPokemon.StringItemList=Kramurx +1199.lstPokemon.StringItemList=Laschoking +1200.lstPokemon.StringItemList=Traunfugil +1201.lstPokemon.StringItemList=Icognito +1202.lstPokemon.StringItemList=Woingenau +1203.lstPokemon.StringItemList=Girafarig +1204.lstPokemon.StringItemList=Tannza +1205.lstPokemon.StringItemList=Forstellka +1206.lstPokemon.StringItemList=Dummisel +1207.lstPokemon.StringItemList=Skorgla +1208.lstPokemon.StringItemList=Stahlos +1209.lstPokemon.StringItemList=Snubbull +1210.lstPokemon.StringItemList=Granbull +1211.lstPokemon.StringItemList=Baldorfish +1212.lstPokemon.StringItemList=Scherox +1213.lstPokemon.StringItemList=Pottrott +1214.lstPokemon.StringItemList=Skaraborn +1215.lstPokemon.StringItemList=Sniebel +1216.lstPokemon.StringItemList=Teddiursa +1217.lstPokemon.StringItemList=Ursaring +1218.lstPokemon.StringItemList=Schneckmag +1219.lstPokemon.StringItemList=Magcargo +1220.lstPokemon.StringItemList=Quiekel +1221.lstPokemon.StringItemList=Keifel +1222.lstPokemon.StringItemList=Corasonn +1223.lstPokemon.StringItemList=Remoraid +1224.lstPokemon.StringItemList=Octillery +1225.lstPokemon.StringItemList=Botogel +1226.lstPokemon.StringItemList=Mantax +1227.lstPokemon.StringItemList=Panzaeron +1228.lstPokemon.StringItemList=Hunduster +1229.lstPokemon.StringItemList=Hundemon +1230.lstPokemon.StringItemList=Seedraking +1231.lstPokemon.StringItemList=Phanpy +1232.lstPokemon.StringItemList=Donphan +1233.lstPokemon.StringItemList=Porygon2 +1234.lstPokemon.StringItemList=Damhirplex +1235.lstPokemon.StringItemList=Farbeagle +1236.lstPokemon.StringItemList=Rabauz +1237.lstPokemon.StringItemList=Kapoera +1238.lstPokemon.StringItemList=Kussilla 1239.lstPokemon.StringItemList=Elekid +1240.lstPokemon.StringItemList=Magby diff --git a/oxt/description.xml b/oxt/description.xml index 5bff29e..d47c398 100644 --- a/oxt/description.xml +++ b/oxt/description.xml @@ -20,7 +20,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Calculator + Pokémon GO IV Rechner diff --git a/oxt/pkg-desc/pkg-description.de-DE.txt b/oxt/pkg-desc/pkg-description.de-DE.txt index 4a97d56..f01d2e3 100644 --- a/oxt/pkg-desc/pkg-description.de-DE.txt +++ b/oxt/pkg-desc/pkg-description.de-DE.txt @@ -1,4 +1,4 @@ PokemonGoIV - Pokémon GO IV Calculator Copyright (c) 2016-2017 imacat -Calculates the individual values (IVs) of the Pokémon. +Berechnet Individuelle Werte (IVs) von Pokémon. From 95fc3c85f099e0ad38a54a2c5390707dc46d108c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Thu, 16 Feb 2017 11:39:23 +0800 Subject: [PATCH 05/10] Fixed "star dust" to "stardust". --- PokemonGoIV/0Main.vb | 30 +++++++++---------- PokemonGoIV/1Data.vb | 6 ++-- PokemonGoIV/9Load.vb | 14 ++++----- oxt/PokemonGoIV/0Main.xba | 30 +++++++++---------- oxt/PokemonGoIV/1Data.xba | 6 ++-- oxt/PokemonGoIV/9Load.xba | 14 ++++----- .../DialogStrings_en_US.properties | 2 +- .../DialogStrings_zh_TW.properties | 2 +- oxt/PokemonGoIV/DlgMain.xdl | 4 +-- 9 files changed, 54 insertions(+), 54 deletions(-) diff --git a/PokemonGoIV/0Main.vb b/PokemonGoIV/0Main.vb index ad56ebf..87253ca 100644 --- a/PokemonGoIV/0Main.vb +++ b/PokemonGoIV/0Main.vb @@ -49,7 +49,7 @@ Type aFindIVParam sPokemon As String nCP As Integer nHP As Integer - nStarDust As Integer + nStardust As Integer nPlayerLevel As Integer bIsNew As Boolean nTotal As Integer @@ -59,7 +59,7 @@ Type aFindIVParam End Type Private maBaseStats () As New aStats -Private mCPM () As Double, mStarDust () As Integer +Private mCPM () As Double, mStardust () As Integer ' subMain: The main program Sub subMain @@ -113,7 +113,7 @@ Function fnAskParam As aFindIVParam .sPokemon = oDialog.getControl ("lstPokemon").getSelectedItem .nCP = oDialog.getControl ("numCP").getValue .nHP = oDialog.getControl ("numHP").getValue - .nStarDust = CInt (oDialog.getControl ("lstStarDust").getSelectedItem) + .nStardust = CInt (oDialog.getControl ("lstStardust").getSelectedItem) .nPlayerLevel = CInt (oDialog.getControl ("lstPlayerLevel").getSelectedItem) .nTotal = oDialog.getControl ("lstTotal").getSelectedItemPos + 1 .nMax = oDialog.getControl ("lstMax").getSelectedItemPos + 1 @@ -174,19 +174,19 @@ End Function Sub subBtnOKCheck (oEvent As object) Dim oDialog As Object Dim oPokemon As Object, oCP As Object - Dim oHP As Object, oStarDust As Object, oOK As Object + Dim oHP As Object, oStardust As Object, oOK As Object oDialog = oEvent.Source.getContext oPokemon = oDialog.getControl ("lstPokemon") oCP = oDialog.getControl ("numCP") oHP = oDialog.getControl ("numHP") - oStarDust = oDialog.getControl ("lstStarDust") + oStardust = oDialog.getControl ("lstStardust") oOK = oDialog.getControl ("btnOK") If oPokemon.getSelectedItemPos <> -1 _ And oCP.getText <> "" _ And oHP.getText <> "" _ - And oStarDust.getSelectedItemPos <> -1 Then + And oStardust.getSelectedItemPos <> -1 Then oOK.setEnable (True) Else oOK.setEnable (False) @@ -571,7 +571,7 @@ Function fnFindIV ( _ Else fStep = 0.5 End If - subReadStarDust + subReadStardust nEvolved = UBound (aBaseStats.mEvolved) If nEvolved > -1 Then ReDim Preserve maEvBaseStats (nEvolved) As New aStats @@ -585,8 +585,8 @@ Function fnFindIV ( _ Next nI End If nN = -1 - For fLevel = 1 To UBound (mStarDust) Step fStep - If mStarDust (CInt (fLevel - 0.5)) = aQuery.nStarDust Then + For fLevel = 1 To UBound (mStardust) Step fStep + If mStardust (CInt (fLevel - 0.5)) = aQuery.nStardust Then For nStamina = 0 To 15 If fnCalcHP (aBaseStats, fLevel, nStamina) = aQuery.nHP Then For nAttack = 0 To 15 @@ -740,7 +740,7 @@ Sub subSaveIV ( _ nEvolved = UBound (maIVs (0).maEvolved) + 1 mRow = Array ( _ - "No", "Pokemon", "CP", "HP", "Star dust", _ + "No", "Pokemon", "CP", "HP", "Stardust", _ "Lv", "Atk", "Def", "Sta", "IV") nFront = UBound (mRow) If aQuery.sPokemon = "Eevee" Then @@ -843,7 +843,7 @@ Sub subSaveIV ( _ mData (1) (1) = aQuery.sPokemon mData (1) (2) = aQuery.nCP mData (1) (3) = aQuery.nHP - mData (1) (4) = aQuery.nStarDust + mData (1) (4) = aQuery.nStardust oRange = oSheet.getCellRangeByPosition ( _ 0, 0, UBound (mData (0)), UBound (mData)) @@ -1154,9 +1154,9 @@ Sub subReadCPM End If End Sub -' subReadStarDust: Reads the star dust table. -Sub subReadStarDust - If UBound (mStarDust) = -1 Then - mStarDust = fnGetStarDustData +' subReadStardust: Reads the stardust table. +Sub subReadStardust + If UBound (mStardust) = -1 Then + mStardust = fnGetStardustData End If End Sub diff --git a/PokemonGoIV/1Data.vb b/PokemonGoIV/1Data.vb index eb4ec37..749ae95 100644 --- a/PokemonGoIV/1Data.vb +++ b/PokemonGoIV/1Data.vb @@ -228,9 +228,9 @@ Function fnGetCPMData As Variant 0.78463697) End Function -' fnGetStarDustData: Returns the star dust data. -Function fnGetStarDustData As Variant - fnGetStarDustData = Array( _ +' fnGetStardustData: Returns the stardust data. +Function fnGetStardustData As Variant + fnGetStardustData = Array( _ -1, _ 200, _ 200, _ diff --git a/PokemonGoIV/9Load.vb b/PokemonGoIV/9Load.vb index cb0c6b7..f56a3f2 100644 --- a/PokemonGoIV/9Load.vb +++ b/PokemonGoIV/9Load.vb @@ -44,7 +44,7 @@ Sub subReadDataSheets & "Option Explicit" sOutput = sOutput & Chr (10) & Chr (10) & fnReadBaseStatsSheet sOutput = sOutput & Chr (10) & Chr (10) & fnReadCPMSheet - sOutput = sOutput & Chr (10) & Chr (10) & fnReadStarDustSheet + sOutput = sOutput & Chr (10) & Chr (10) & fnReadStardustSheet subShowBasicData (sOutput) End Sub @@ -203,8 +203,8 @@ Function fnReadCPMSheet As String fnReadCPMSheet = sOutput End Function -' fnReadStarDustSheet: Reads the star dust sheet. -Function fnReadStarDustSheet As String +' fnReadStardustSheet: Reads the stardust sheet. +Function fnReadStardustSheet As String Dim oSheet As Object, oRange As Object, mData As Variant Dim nI As Integer, sOutput As String @@ -213,9 +213,9 @@ Function fnReadStarDustSheet As String mData = oRange.getDataArray sOutput = "" _ - & "' fnGetStarDustData: Returns the star dust data." & Chr (10) _ - & "Function fnGetStarDustData As Variant" & Chr (10) _ - & Chr (9) & "fnGetStarDustData = Array( _" & Chr (10) _ + & "' fnGetStardustData: Returns the stardust data." & Chr (10) _ + & "Function fnGetStardustData As Variant" & Chr (10) _ + & Chr (9) & "fnGetStardustData = Array( _" & Chr (10) _ & Chr (9) & Chr (9) & "-1, _" & Chr (10) For nI = 1 To UBound (mData) - 1 Step 2 sOutput = sOutput _ @@ -225,5 +225,5 @@ Function fnReadStarDustSheet As String sOutput = sOutput _ & Chr (9) & Chr (9) & mData (nI) (2) & ")" & Chr (10) _ & "End Function" - fnReadStarDustSheet = sOutput + fnReadStardustSheet = sOutput End Function diff --git a/oxt/PokemonGoIV/0Main.xba b/oxt/PokemonGoIV/0Main.xba index ee3189a..7ed58cd 100644 --- a/oxt/PokemonGoIV/0Main.xba +++ b/oxt/PokemonGoIV/0Main.xba @@ -51,7 +51,7 @@ Type aFindIVParam sPokemon As String nCP As Integer nHP As Integer - nStarDust As Integer + nStardust As Integer nPlayerLevel As Integer bIsNew As Boolean nTotal As Integer @@ -61,7 +61,7 @@ Type aFindIVParam End Type Private maBaseStats () As New aStats -Private mCPM () As Double, mStarDust () As Integer +Private mCPM () As Double, mStardust () As Integer ' subMain: The main program Sub subMain @@ -115,7 +115,7 @@ Function fnAskParam As aFindIVParam .sPokemon = oDialog.getControl ("lstPokemon").getSelectedItem .nCP = oDialog.getControl ("numCP").getValue .nHP = oDialog.getControl ("numHP").getValue - .nStarDust = CInt (oDialog.getControl ("lstStarDust").getSelectedItem) + .nStardust = CInt (oDialog.getControl ("lstStardust").getSelectedItem) .nPlayerLevel = CInt (oDialog.getControl ("lstPlayerLevel").getSelectedItem) .nTotal = oDialog.getControl ("lstTotal").getSelectedItemPos + 1 .nMax = oDialog.getControl ("lstMax").getSelectedItemPos + 1 @@ -176,19 +176,19 @@ End Function Sub subBtnOKCheck (oEvent As object) Dim oDialog As Object Dim oPokemon As Object, oCP As Object - Dim oHP As Object, oStarDust As Object, oOK As Object + Dim oHP As Object, oStardust As Object, oOK As Object oDialog = oEvent.Source.getContext oPokemon = oDialog.getControl ("lstPokemon") oCP = oDialog.getControl ("numCP") oHP = oDialog.getControl ("numHP") - oStarDust = oDialog.getControl ("lstStarDust") + oStardust = oDialog.getControl ("lstStardust") oOK = oDialog.getControl ("btnOK") If oPokemon.getSelectedItemPos <> -1 _ And oCP.getText <> "" _ And oHP.getText <> "" _ - And oStarDust.getSelectedItemPos <> -1 Then + And oStardust.getSelectedItemPos <> -1 Then oOK.setEnable (True) Else oOK.setEnable (False) @@ -573,7 +573,7 @@ Function fnFindIV ( _ Else fStep = 0.5 End If - subReadStarDust + subReadStardust nEvolved = UBound (aBaseStats.mEvolved) If nEvolved > -1 Then ReDim Preserve maEvBaseStats (nEvolved) As New aStats @@ -587,8 +587,8 @@ Function fnFindIV ( _ Next nI End If nN = -1 - For fLevel = 1 To UBound (mStarDust) Step fStep - If mStarDust (CInt (fLevel - 0.5)) = aQuery.nStarDust Then + For fLevel = 1 To UBound (mStardust) Step fStep + If mStardust (CInt (fLevel - 0.5)) = aQuery.nStardust Then For nStamina = 0 To 15 If fnCalcHP (aBaseStats, fLevel, nStamina) = aQuery.nHP Then For nAttack = 0 To 15 @@ -742,7 +742,7 @@ Sub subSaveIV ( _ nEvolved = UBound (maIVs (0).maEvolved) + 1 mRow = Array ( _ - "No", "Pokemon", "CP", "HP", "Star dust", _ + "No", "Pokemon", "CP", "HP", "Stardust", _ "Lv", "Atk", "Def", "Sta", "IV") nFront = UBound (mRow) If aQuery.sPokemon = "Eevee" Then @@ -845,7 +845,7 @@ Sub subSaveIV ( _ mData (1) (1) = aQuery.sPokemon mData (1) (2) = aQuery.nCP mData (1) (3) = aQuery.nHP - mData (1) (4) = aQuery.nStarDust + mData (1) (4) = aQuery.nStardust oRange = oSheet.getCellRangeByPosition ( _ 0, 0, UBound (mData (0)), UBound (mData)) @@ -1156,10 +1156,10 @@ Sub subReadCPM End If End Sub -' subReadStarDust: Reads the star dust table. -Sub subReadStarDust - If UBound (mStarDust) = -1 Then - mStarDust = fnGetStarDustData +' subReadStardust: Reads the stardust table. +Sub subReadStardust + If UBound (mStardust) = -1 Then + mStardust = fnGetStardustData End If End Sub \ No newline at end of file diff --git a/oxt/PokemonGoIV/1Data.xba b/oxt/PokemonGoIV/1Data.xba index 8cd76b8..f6a6c1f 100644 --- a/oxt/PokemonGoIV/1Data.xba +++ b/oxt/PokemonGoIV/1Data.xba @@ -230,9 +230,9 @@ Function fnGetCPMData As Variant 0.78463697) End Function -' fnGetStarDustData: Returns the star dust data. -Function fnGetStarDustData As Variant - fnGetStarDustData = Array( _ +' fnGetStardustData: Returns the stardust data. +Function fnGetStardustData As Variant + fnGetStardustData = Array( _ -1, _ 200, _ 200, _ diff --git a/oxt/PokemonGoIV/9Load.xba b/oxt/PokemonGoIV/9Load.xba index fc60d53..ea292a7 100644 --- a/oxt/PokemonGoIV/9Load.xba +++ b/oxt/PokemonGoIV/9Load.xba @@ -46,7 +46,7 @@ Sub subReadDataSheets & "Option Explicit" sOutput = sOutput & Chr (10) & Chr (10) & fnReadBaseStatsSheet sOutput = sOutput & Chr (10) & Chr (10) & fnReadCPMSheet - sOutput = sOutput & Chr (10) & Chr (10) & fnReadStarDustSheet + sOutput = sOutput & Chr (10) & Chr (10) & fnReadStardustSheet subShowBasicData (sOutput) End Sub @@ -205,8 +205,8 @@ Function fnReadCPMSheet As String fnReadCPMSheet = sOutput End Function -' fnReadStarDustSheet: Reads the star dust sheet. -Function fnReadStarDustSheet As String +' fnReadStardustSheet: Reads the stardust sheet. +Function fnReadStardustSheet As String Dim oSheet As Object, oRange As Object, mData As Variant Dim nI As Integer, sOutput As String @@ -215,9 +215,9 @@ Function fnReadStarDustSheet As String mData = oRange.getDataArray sOutput = "" _ - & "' fnGetStarDustData: Returns the star dust data." & Chr (10) _ - & "Function fnGetStarDustData As Variant" & Chr (10) _ - & Chr (9) & "fnGetStarDustData = Array( _" & Chr (10) _ + & "' fnGetStardustData: Returns the stardust data." & Chr (10) _ + & "Function fnGetStardustData As Variant" & Chr (10) _ + & Chr (9) & "fnGetStardustData = Array( _" & Chr (10) _ & Chr (9) & Chr (9) & "-1, _" & Chr (10) For nI = 1 To UBound (mData) - 1 Step 2 sOutput = sOutput _ @@ -227,6 +227,6 @@ Function fnReadStarDustSheet As String sOutput = sOutput _ & Chr (9) & Chr (9) & mData (nI) (2) & ")" & Chr (10) _ & "End Function" - fnReadStarDustSheet = sOutput + fnReadStardustSheet = sOutput End Function \ No newline at end of file diff --git a/oxt/PokemonGoIV/DialogStrings_en_US.properties b/oxt/PokemonGoIV/DialogStrings_en_US.properties index 228c244..ebfc72a 100644 --- a/oxt/PokemonGoIV/DialogStrings_en_US.properties +++ b/oxt/PokemonGoIV/DialogStrings_en_US.properties @@ -3,7 +3,7 @@ 2.DlgMain.txtPokemon.Label=~Pok\u00e9mon: 3.DlgMain.txtCP.Label=~CP: 4.DlgMain.txtHP.Label=~HP: -5.DlgMain.txtStarDust.Label=S~tar dust: +5.DlgMain.txtStardust.Label=S~tardust: 6.DlgMain.txtPlayerLevel.Label=Player ~level: 7.DlgMain.cbxIsNew.Label=This Pok\u00e9mon has ~not been powered-up yet. 8.DlgMain.grpAppraisals.Label=Team Leader Appraisal diff --git a/oxt/PokemonGoIV/DialogStrings_zh_TW.properties b/oxt/PokemonGoIV/DialogStrings_zh_TW.properties index c9be928..98696d4 100644 --- a/oxt/PokemonGoIV/DialogStrings_zh_TW.properties +++ b/oxt/PokemonGoIV/DialogStrings_zh_TW.properties @@ -3,7 +3,7 @@ 2.DlgMain.txtPokemon.Label=\u5bf6\u53ef\u5922(~P)\uff1a 3.DlgMain.txtCP.Label=~CP: 4.DlgMain.txtHP.Label=~HP: -5.DlgMain.txtStarDust.Label=S~tar dust: +5.DlgMain.txtStardust.Label=S~tardust: 6.DlgMain.txtPlayerLevel.Label=\u73a9\u5bb6\u7b49\u7d1a(~L)\uff1a 7.DlgMain.cbxIsNew.Label=\u9019\u96bb\u5bf6\u53ef\u5922\u9084\u6c92\u5f37\u5316\u904e(~N)\u3002 8.DlgMain.grpAppraisals.Label=\u968a\u9577\u8a55\u50f9 diff --git a/oxt/PokemonGoIV/DlgMain.xdl b/oxt/PokemonGoIV/DlgMain.xdl index 9f657ac..d47dab6 100644 --- a/oxt/PokemonGoIV/DlgMain.xdl +++ b/oxt/PokemonGoIV/DlgMain.xdl @@ -181,8 +181,8 @@ - - + + From 8b32c9cb75453b76999512a6e37106516e86ed21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Thu, 16 Feb 2017 11:41:22 +0800 Subject: [PATCH 06/10] Fixed "StarDust" to "Stardust". --- oxt/PokemonGoIV/DialogStrings_de_DE.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oxt/PokemonGoIV/DialogStrings_de_DE.properties b/oxt/PokemonGoIV/DialogStrings_de_DE.properties index 525ebf4..98c39d1 100644 --- a/oxt/PokemonGoIV/DialogStrings_de_DE.properties +++ b/oxt/PokemonGoIV/DialogStrings_de_DE.properties @@ -3,7 +3,7 @@ 2.DlgMain.txtPokemon.Label=~Pok\u00e9mon: 3.DlgMain.txtCP.Label=~WP: 4.DlgMain.txtHP.Label=~KP: -5.DlgMain.txtStarDust.Label=~Sternenstaub: +5.DlgMain.txtStardust.Label=~Sternenstaub: 6.DlgMain.txtPlayerLevel.Label=Spieler ~Level: 7.DlgMain.cbxIsNew.Label=Dieses Pok\u00e9mon hat noch ~kein Power-Up bekommen. 8.DlgMain.grpAppraisals.Label=Bewertung des Teamleiters From e2adf51449409ba5495e6bebb6944e46281a493c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Thu, 16 Feb 2017 11:50:03 +0800 Subject: [PATCH 07/10] Fixed the language id "de-DE" to "de". --- oxt/AddonConfiguration.xcu | 78 +++++++++---------- oxt/Addons.xcu | 6 +- oxt/META-INF/manifest.xml | 2 +- oxt/Office/UI/BaseWindowState.xcu | 2 +- oxt/Office/UI/BasicIDEWindowState.xcu | 2 +- oxt/Office/UI/CalcWindowState.xcu | 2 +- oxt/Office/UI/DrawWindowState.xcu | 2 +- oxt/Office/UI/ImpressWindowState.xcu | 2 +- oxt/Office/UI/MathWindowState.xcu | 2 +- oxt/Office/UI/StartModuleWindowState.xcu | 2 +- oxt/Office/UI/WriterWindowState.xcu | 2 +- oxt/description.xml | 2 +- ...ption.de-DE.txt => pkg-description.de.txt} | 0 13 files changed, 52 insertions(+), 52 deletions(-) rename oxt/pkg-desc/{pkg-description.de-DE.txt => pkg-description.de.txt} (100%) diff --git a/oxt/AddonConfiguration.xcu b/oxt/AddonConfiguration.xcu index f901904..2123a63 100644 --- a/oxt/AddonConfiguration.xcu +++ b/oxt/AddonConfiguration.xcu @@ -10,7 +10,7 @@ Calculates the individual values (IVs) of the Pokémon. 計算寶可夢的 IV 值。 - Berechnet Individuelle Werte (IVs) von Pokémon. + Berechnet Individuelle Werte (IVs) von Pokémon. @VERSION@ @@ -28,7 +28,7 @@ Copyright © 2016-2017 imacat 版權所有 © 2016-2017 依瑪貓 - Copyright © 2016-2017 imacat + Copyright © 2016-2017 imacat @@ -52,25 +52,25 @@ Found no matching IV. 找不出符合的 IV 值。 - Keine passenden individuellen Werte gefunden. + Keine passenden individuellen Werte gefunden. Attack - Angriff + Angriff Defense - Verteidigung + Verteidigung HP - KP + KP @@ -78,67 +78,67 @@ Candela, leader of Team Valor, says: Valor 隊隊長 Candela 說： - Candela, Leiter von Team Wagemut, sagt: + Candela, Leiter von Team Wagemut, sagt: Overall, your [Pokémon] simply amazes me. It can accomplish anything! - Von deinem [Pokémon] bin ich insgesamt total beeindruckt. Es kann einfach alles! + Von deinem [Pokémon] bin ich insgesamt total beeindruckt. Es kann einfach alles! Overall, your [Pokémon] is a strong Pokémon. You should be proud! - Dein [Pokémon] ist insgesamt sehr stark. Du kannst stolz sein! + Dein [Pokémon] ist insgesamt sehr stark. Du kannst stolz sein! Overall, your [Pokémon] is a decent Pokémon. - Dein [Pokémon] ist insgesamt ganz gut! + Dein [Pokémon] ist insgesamt ganz gut! Overall, your [Pokémon] may not be great in battle, but I still like it! - Dein [Pokémon] ist zwar insgesamt im Kampf nicht allzu beeindruckend, aber ich mag es trotzdem! + Dein [Pokémon] ist zwar insgesamt im Kampf nicht allzu beeindruckend, aber ich mag es trotzdem! Its [Stat] is its strongest feature. - Sein [Stat]-Wert ist seine stärkste Eigenschaft. + Sein [Stat]-Wert ist seine stärkste Eigenschaft. I'm just as impressed with its [Stat]. - Ich bin genauso beeindruckt durch seinen [Stat]-Wert. + Ich bin genauso beeindruckt durch seinen [Stat]-Wert. I'm blown away by its stats. WOW! - Seine Werte hauen mich um. WOW! + Seine Werte hauen mich um. WOW! It's got excellent stats! How exciting! - Es hat hervorragende Werte! Wie aufregend! + Es hat hervorragende Werte! Wie aufregend! Its stats indicate that in battle, it'll get the job done. - Seine Werte sind nicht von schlechten Eltern. + Seine Werte sind nicht von schlechten Eltern. Its stats don't point to greatness in battle. - Seine Werte werden dir im Kampf nicht viel bringen. + Seine Werte werden dir im Kampf nicht viel bringen. @@ -146,67 +146,67 @@ Blanche, leader of Team Mystic, says: Mystic 隊隊長 Blanche 說： - Blanche, Leiter von Team Weisheit, sagt: + Blanche, Leiter von Team Weisheit, sagt: Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon! - Dein [Pokémon] ist insgesamt einfach erstaunlich. Wirklich ein atemberaubendes Exemplar! + Dein [Pokémon] ist insgesamt einfach erstaunlich. Wirklich ein atemberaubendes Exemplar! Overall, your [Pokémon] has certainly caught my attention. - Dein [Pokémon] ist mir insgesamt wirklich aufgefallen. + Dein [Pokémon] ist mir insgesamt wirklich aufgefallen. Overall, your [Pokémon] is above average. - Dein [Pokémon] ist insgesamt ein gutes Pokémon. + Dein [Pokémon] ist insgesamt ein gutes Pokémon. Overall, your [Pokémon] is not likely to make much headway in battle. - Dein [Pokémon] wird im Kampf insgesamt wahrscheinlich keine großen Fortschritte machen. + Dein [Pokémon] wird im Kampf insgesamt wahrscheinlich keine großen Fortschritte machen. I see that its best attribute is its [Stat]. - Seine beste Eigenschaft ist offensichtlich sein [Stat]-Wert. + Seine beste Eigenschaft ist offensichtlich sein [Stat]-Wert. It is matched equally by its [Stat]. - Sein [Stat]-Wert ist genauso gut! + Sein [Stat]-Wert ist genauso gut! Its stats exceed my calculations. It's incredible! - Seine Werte sind so hoch, dass ich sie gar nicht berechnen kann! Unglaublich! + Seine Werte sind so hoch, dass ich sie gar nicht berechnen kann! Unglaublich! I am certainly impressed by its stats, I must say. - Ich muss sagen, dass ich von seinen Werten sehr beeindruckt bin. + Ich muss sagen, dass ich von seinen Werten sehr beeindruckt bin. Its stats are noticeably trending to the positive. - Seine Werte sind recht beeindruckend. + Seine Werte sind recht beeindruckend. Its stats are not out of the norm, in my opinion. - Seine Werte sind insgesamt ganz ok. + Seine Werte sind insgesamt ganz ok. @@ -214,67 +214,67 @@ Spark, leader of Team Instinct, says: Instinct 隊隊長 Spark 說： - Spark, Leiter von Team Intuition, sagt: + Spark, Leiter von Team Intuition, sagt: Overall, your [Pokémon] is not likely to make much headway in battle. - Dein [Pokémon] kann es im Kampf mit allen aufnehmen! + Dein [Pokémon] kann es im Kampf mit allen aufnehmen! Overall, your [Pokémon] is really strong! - Dein [Pokémon] ist insgesamt wirklich stark! + Dein [Pokémon] ist insgesamt wirklich stark! Overall, your [Pokémon] is pretty decent! - Dein [Pokémon] ist insgesamt ganz gut. + Dein [Pokémon] ist insgesamt ganz gut. Overall, your [Pokémon] has room for improvement as far as battling goes. - Dein [Pokémon] kann sich im Kampf noch verbessern! + Dein [Pokémon] kann sich im Kampf noch verbessern! Its best quality is [Stat]. - Sein [Stat]-Wert ist seine beste Eigenschaft! + Sein [Stat]-Wert ist seine beste Eigenschaft! Its [Stat] is great, too! - Auch sein [Stat]-Wert ist klasse! + Auch sein [Stat]-Wert ist klasse! Its stats are the best I've ever seen! No doubt about it! - Seine Werte sind die besten, die ich je gesehen habe! + Seine Werte sind die besten, die ich je gesehen habe! Its stats are really strong! Impressive. - Seine Werte sind wirklich hoch! Hut ab! + Seine Werte sind wirklich hoch! Hut ab! It's definitely got some good stats. Definitely! - Seine Werte können sich sehen lassen! + Seine Werte können sich sehen lassen! Its stats are all right, but kinda basic, as far as I can see. - Seine Werte sind okay. + Seine Werte sind okay. diff --git a/oxt/Addons.xcu b/oxt/Addons.xcu index a5e4a68..936b28f 100644 --- a/oxt/Addons.xcu +++ b/oxt/Addons.xcu @@ -11,7 +11,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Rechner + Pokémon GO IV Rechner @@ -27,7 +27,7 @@ Calculates Pokémon IV 計算寶可夢 IV - Berechnet IV von Pokémon + Berechnet IV von Pokémon _self @@ -49,7 +49,7 @@ Calculates Pokémon IV 計算寶可夢 IV - Berechnet IV von Pokémon + Berechnet IV von Pokémon _self diff --git a/oxt/META-INF/manifest.xml b/oxt/META-INF/manifest.xml index 44a9126..91759cd 100644 --- a/oxt/META-INF/manifest.xml +++ b/oxt/META-INF/manifest.xml @@ -3,7 +3,7 @@ - + diff --git a/oxt/Office/UI/BaseWindowState.xcu b/oxt/Office/UI/BaseWindowState.xcu index da164f4..935a618 100644 --- a/oxt/Office/UI/BaseWindowState.xcu +++ b/oxt/Office/UI/BaseWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Rechner + Pokémon GO IV Rechner diff --git a/oxt/Office/UI/BasicIDEWindowState.xcu b/oxt/Office/UI/BasicIDEWindowState.xcu index 4ef94d4..b12d8fb 100644 --- a/oxt/Office/UI/BasicIDEWindowState.xcu +++ b/oxt/Office/UI/BasicIDEWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Rechner + Pokémon GO IV Rechner diff --git a/oxt/Office/UI/CalcWindowState.xcu b/oxt/Office/UI/CalcWindowState.xcu index c145c78..a93ce4d 100644 --- a/oxt/Office/UI/CalcWindowState.xcu +++ b/oxt/Office/UI/CalcWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Rechner + Pokémon GO IV Rechner diff --git a/oxt/Office/UI/DrawWindowState.xcu b/oxt/Office/UI/DrawWindowState.xcu index 44cd82e..f8bb2f8 100644 --- a/oxt/Office/UI/DrawWindowState.xcu +++ b/oxt/Office/UI/DrawWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Rechner + Pokémon GO IV Rechner diff --git a/oxt/Office/UI/ImpressWindowState.xcu b/oxt/Office/UI/ImpressWindowState.xcu index 681713b..f43c101 100644 --- a/oxt/Office/UI/ImpressWindowState.xcu +++ b/oxt/Office/UI/ImpressWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Rechner + Pokémon GO IV Rechner diff --git a/oxt/Office/UI/MathWindowState.xcu b/oxt/Office/UI/MathWindowState.xcu index 6fd2d33..4f9655c 100644 --- a/oxt/Office/UI/MathWindowState.xcu +++ b/oxt/Office/UI/MathWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Rechner + Pokémon GO IV Rechner diff --git a/oxt/Office/UI/StartModuleWindowState.xcu b/oxt/Office/UI/StartModuleWindowState.xcu index a2f0e7e..f83ccd2 100644 --- a/oxt/Office/UI/StartModuleWindowState.xcu +++ b/oxt/Office/UI/StartModuleWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Rechner + Pokémon GO IV Rechner diff --git a/oxt/Office/UI/WriterWindowState.xcu b/oxt/Office/UI/WriterWindowState.xcu index e167532..3a2a442 100644 --- a/oxt/Office/UI/WriterWindowState.xcu +++ b/oxt/Office/UI/WriterWindowState.xcu @@ -9,7 +9,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Rechner + Pokémon GO IV Rechner diff --git a/oxt/description.xml b/oxt/description.xml index d47c398..afd1328 100644 --- a/oxt/description.xml +++ b/oxt/description.xml @@ -20,7 +20,7 @@ Pokémon GO IV Calculator 寶可夢 GO IV 計算機 - Pokémon GO IV Rechner + Pokémon GO IV Rechner diff --git a/oxt/pkg-desc/pkg-description.de-DE.txt b/oxt/pkg-desc/pkg-description.de.txt similarity index 100% rename from oxt/pkg-desc/pkg-description.de-DE.txt rename to oxt/pkg-desc/pkg-description.de.txt From 64079595be6ad1bd0db2056fb4e0e77c556ee4f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Sat, 18 Feb 2017 15:49:05 +0800 Subject: [PATCH 08/10] Reverted "Stardust" to "Stardust", for later cherry-pick. --- oxt/PokemonGoIV/DlgMain.xdl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oxt/PokemonGoIV/DlgMain.xdl b/oxt/PokemonGoIV/DlgMain.xdl index d47dab6..9f657ac 100644 --- a/oxt/PokemonGoIV/DlgMain.xdl +++ b/oxt/PokemonGoIV/DlgMain.xdl @@ -181,8 +181,8 @@ - - + + From 98d3149264ab1d7045ae2303bbd6ad829dbcaf9b Mon Sep 17 00:00:00 2001 From: Andreas Frisch Date: Wed, 15 Feb 2017 12:57:03 +0100 Subject: [PATCH 09/10] enlarge dialog, increase space for texts, increase dropdown lists' element counts --- oxt/PokemonGoIV/DlgMain.xdl | 55 +++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/oxt/PokemonGoIV/DlgMain.xdl b/oxt/PokemonGoIV/DlgMain.xdl index 9f657ac..3b711d5 100644 --- a/oxt/PokemonGoIV/DlgMain.xdl +++ b/oxt/PokemonGoIV/DlgMain.xdl @@ -1,6 +1,6 @@ - + @@ -8,8 +8,8 @@ - - + + @@ -169,20 +169,21 @@ + - - + + - + - - + + @@ -207,8 +208,8 @@ - - + + @@ -252,34 +253,34 @@ - - + + - + - + - + - + - - - - - + + + + + - - - - - - + + + + + + From 42445bcd679f02e301a56a9154202b299d582c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Sat, 18 Feb 2017 17:16:49 +0800 Subject: [PATCH 10/10] Updated the dialog for styling and text width for Deutsch. --- PokemonGoIV/0Main.vb | 14 ++++----- oxt/PokemonGoIV/0Main.xba | 14 ++++----- oxt/PokemonGoIV/DlgMain.xdl | 58 ++++++++++++++++++------------------- 3 files changed, 39 insertions(+), 47 deletions(-) diff --git a/PokemonGoIV/0Main.vb b/PokemonGoIV/0Main.vb index 87253ca..46673d9 100644 --- a/PokemonGoIV/0Main.vb +++ b/PokemonGoIV/0Main.vb @@ -330,21 +330,16 @@ Sub subUpdateBestStatAppraisal (oDialog As Object, sAppraisal) Dim oText As Object, oList As Object, nX As Integer Dim sBefore As String, nBeforeWidth As Integer Dim sAfter As String, nAfterWidth As Integer + Dim nDialogWidth As Integer Dim nPos As Integer Dim mItems () As String nPos = InStr (sAppraisal, "[Stat]") sBefore = Left (sAppraisal, nPos - 1) - If Right (sBefore, 1) <> " " Then - sBefore = sBefore & " " - End If - nBeforeWidth = CInt (Len (sBefore) * 2.3) + nBeforeWidth = CInt (Len (sBefore) * 2.8) sAfter = Right (sAppraisal, _ Len (sAppraisal) - nPos - Len ("[Stat]") + 1) - If Left (sAfter, 1) <> " " Then - sAfter = " " & sAfter - End If - nAfterWidth = CInt (Len (sAfter) * 2.3) + nDialogWidth = oDialog.getModel.getPropertyValue ("Width") oText = oDialog.getControl ("txtBestBefore") oText.getModel.setPropertyValue ("Width", nBeforeWidth) @@ -361,8 +356,9 @@ Sub subUpdateBestStatAppraisal (oDialog As Object, sAppraisal) oList.addItems (mItems, 0) oList.getModel.setPropertyValue ("PositionX", nX) oList.setVisible (True) - nX = nX + oList.getModel.getPropertyValue ("Width") + 2 + nX = nX + oList.getModel.getPropertyValue ("Width") + nAfterWidth = nDialogWidth - nX - 10 oText = oDialog.getControl ("txtBestAfter") oText.getModel.setPropertyValue ("PositionX", nX) oText.getModel.setPropertyValue ("Width", nAfterWidth) diff --git a/oxt/PokemonGoIV/0Main.xba b/oxt/PokemonGoIV/0Main.xba index 7ed58cd..7d20568 100644 --- a/oxt/PokemonGoIV/0Main.xba +++ b/oxt/PokemonGoIV/0Main.xba @@ -332,21 +332,16 @@ Sub subUpdateBestStatAppraisal (oDialog As Object, sAppraisal) Dim oText As Object, oList As Object, nX As Integer Dim sBefore As String, nBeforeWidth As Integer Dim sAfter As String, nAfterWidth As Integer + Dim nDialogWidth As Integer Dim nPos As Integer Dim mItems () As String nPos = InStr (sAppraisal, "[Stat]") sBefore = Left (sAppraisal, nPos - 1) - If Right (sBefore, 1) <> " " Then - sBefore = sBefore & " " - End If - nBeforeWidth = CInt (Len (sBefore) * 2.3) + nBeforeWidth = CInt (Len (sBefore) * 2.8) sAfter = Right (sAppraisal, _ Len (sAppraisal) - nPos - Len ("[Stat]") + 1) - If Left (sAfter, 1) <> " " Then - sAfter = " " & sAfter - End If - nAfterWidth = CInt (Len (sAfter) * 2.3) + nDialogWidth = oDialog.getModel.getPropertyValue ("Width") oText = oDialog.getControl ("txtBestBefore") oText.getModel.setPropertyValue ("Width", nBeforeWidth) @@ -363,8 +358,9 @@ Sub subUpdateBestStatAppraisal (oDialog As Object, sAppraisal) oList.addItems (mItems, 0) oList.getModel.setPropertyValue ("PositionX", nX) oList.setVisible (True) - nX = nX + oList.getModel.getPropertyValue ("Width") + 2 + nX = nX + oList.getModel.getPropertyValue ("Width") + nAfterWidth = nDialogWidth - nX - 10 oText = oDialog.getControl ("txtBestAfter") oText.getModel.setPropertyValue ("PositionX", nX) oText.getModel.setPropertyValue ("Width", nAfterWidth) diff --git a/oxt/PokemonGoIV/DlgMain.xdl b/oxt/PokemonGoIV/DlgMain.xdl index 3b711d5..02df704 100644 --- a/oxt/PokemonGoIV/DlgMain.xdl +++ b/oxt/PokemonGoIV/DlgMain.xdl @@ -1,6 +1,6 @@ - + @@ -8,8 +8,8 @@ - - + + @@ -169,21 +169,21 @@ - + - - + + - + - - + + @@ -208,8 +208,8 @@ - - + + @@ -253,34 +253,34 @@ - - + + - + - + - + - + - - - - - + + + + + - - - - - - + + + + + + - + \ No newline at end of file