Merge from BRANCH_1_0.

1 files changed, 135 insertions, 143 deletions

diff --git a/i18n/zh_TW/oxygen.ts b/i18n/zh_TW/oxygen.ts
index 2083bf8..38a07db 100644
--- a/i18n/zh_TW/oxygen.ts
+++ b/i18n/zh_TW/oxygen.ts
@@ -12,6 +12,2 @@
     <message>
-        <source>Form1</source>
-        <translation>表單1</translation>
-    </message>
-    <message>
         <source>Molecular Weight</source>
@@ -35,6 +31,2 @@
     <message>
-        <source>Weight:</source>
-        <translation>重量:</translation>
-    </message>
-    <message>
         <source>Block</source>
@@ -90,2 +82,6 @@
     </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
@@ -109,28 +105,5 @@
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation>週期系統</translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation>錯誤: 
-</translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation>Chemical Data</translation>
-    </message>
     <message>
         <source>Hydrogen</source>
-        <translation>氫</translation>
+        <translation type="unfinished">氫</translation>
     </message>
@@ -138,3 +111,3 @@
         <source>Helium</source>
-        <translation>氦</translation>
+        <translation type="unfinished">氦</translation>
     </message>
@@ -142,3 +115,3 @@
         <source>Lithium</source>
-        <translation>鋰</translation>
+        <translation type="unfinished">鋰</translation>
     </message>
@@ -146,3 +119,3 @@
         <source>Beryllium</source>
-        <translation>鈹</translation>
+        <translation type="unfinished">鈹</translation>
     </message>
@@ -150,3 +123,3 @@
         <source>Boron</source>
-        <translation>硼</translation>
+        <translation type="unfinished">硼</translation>
     </message>
@@ -154,3 +127,3 @@
         <source>Carbon</source>
-        <translation>碳</translation>
+        <translation type="unfinished">碳</translation>
     </message>
@@ -158,7 +131,3 @@
         <source>Nitrogen</source>
-        <translation>氮</translation>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation>氧</translation>
+        <translation type="unfinished">氮</translation>
     </message>
@@ -166,3 +135,3 @@
         <source>Fluorine</source>
-        <translation>氟</translation>
+        <translation type="unfinished">氟</translation>
     </message>
@@ -170,3 +139,3 @@
         <source>Neon</source>
-        <translation>氖</translation>
+        <translation type="unfinished">氖</translation>
     </message>
@@ -174,3 +143,3 @@
         <source>Sodium</source>
-        <translation>鈉</translation>
+        <translation type="unfinished">鈉</translation>
     </message>
@@ -178,3 +147,3 @@
         <source>Magnesium</source>
-        <translation>鎂</translation>
+        <translation type="unfinished">鎂</translation>
     </message>
@@ -182,3 +151,3 @@
         <source>Aluminum</source>
-        <translation>鋁</translation>
+        <translation type="unfinished">鋁</translation>
     </message>
@@ -186,3 +155,3 @@
         <source>Silicon</source>
-        <translation>矽</translation>
+        <translation type="unfinished">矽</translation>
     </message>
@@ -190,3 +159,3 @@
         <source>Phosphorus</source>
-        <translation>磷</translation>
+        <translation type="unfinished">磷</translation>
     </message>
@@ -194,3 +163,3 @@
         <source>Sulfur</source>
-        <translation>硫</translation>
+        <translation type="unfinished">硫</translation>
     </message>
@@ -198,3 +167,3 @@
         <source>Chlorine</source>
-        <translation>氯</translation>
+        <translation type="unfinished">氯</translation>
     </message>
@@ -202,3 +171,3 @@
         <source>Argon</source>
-        <translation>氬</translation>
+        <translation type="unfinished">氬</translation>
     </message>
@@ -206,3 +175,3 @@
         <source>Potassium</source>
-        <translation>鉀</translation>
+        <translation type="unfinished">鉀</translation>
     </message>
@@ -210,3 +179,3 @@
         <source>Calcium</source>
-        <translation>鈣</translation>
+        <translation type="unfinished">鈣</translation>
     </message>
@@ -214,3 +183,3 @@
         <source>Scandium</source>
-        <translation>鈧</translation>
+        <translation type="unfinished">鈧</translation>
     </message>
@@ -218,3 +187,3 @@
         <source>Titanium</source>
-        <translation>鈦</translation>
+        <translation type="unfinished">鈦</translation>
     </message>
@@ -222,3 +191,3 @@
         <source>Vanadium</source>
-        <translation>釩</translation>
+        <translation type="unfinished">釩</translation>
     </message>
@@ -226,3 +195,3 @@
         <source>Chromium</source>
-        <translation>鉻</translation>
+        <translation type="unfinished">鉻</translation>
     </message>
@@ -230,3 +199,3 @@
         <source>Manganese</source>
-        <translation>錳</translation>
+        <translation type="unfinished">錳</translation>
     </message>
@@ -234,3 +203,3 @@
         <source>Iron</source>
-        <translation>鐵</translation>
+        <translation type="unfinished">鐵</translation>
     </message>
@@ -238,3 +207,3 @@
         <source>Cobalt</source>
-        <translation>鈷</translation>
+        <translation type="unfinished">鈷</translation>
     </message>
@@ -242,3 +211,3 @@
         <source>Nickel</source>
-        <translation>鎳</translation>
+        <translation type="unfinished">鎳</translation>
     </message>
@@ -246,3 +215,3 @@
         <source>Copper</source>
-        <translation>銅</translation>
+        <translation type="unfinished">銅</translation>
     </message>
@@ -250,3 +219,3 @@
         <source>Zinc</source>
-        <translation>鋅</translation>
+        <translation type="unfinished">鋅</translation>
     </message>
@@ -254,3 +223,3 @@
         <source>Gallium</source>
-        <translation>鎵</translation>
+        <translation type="unfinished">鎵</translation>
     </message>
@@ -258,3 +227,3 @@
         <source>Germanium</source>
-        <translation>鍺</translation>
+        <translation type="unfinished">鍺</translation>
     </message>
@@ -262,3 +231,3 @@
         <source>Arsenic</source>
-        <translation>砷</translation>
+        <translation type="unfinished">砷</translation>
     </message>
@@ -266,3 +235,3 @@
         <source>Selenium</source>
-        <translation>硒</translation>
+        <translation type="unfinished">硒</translation>
     </message>
@@ -270,3 +239,3 @@
         <source>Bromine</source>
-        <translation>溴</translation>
+        <translation type="unfinished">溴</translation>
     </message>
@@ -274,3 +243,3 @@
         <source>Krypton</source>
-        <translation>氪</translation>
+        <translation type="unfinished">氪</translation>
     </message>
@@ -278,3 +247,3 @@
         <source>Rubidium</source>
-        <translation>銣</translation>
+        <translation type="unfinished">銣</translation>
     </message>
@@ -282,3 +251,3 @@
         <source>Strontium</source>
-        <translation>鍶</translation>
+        <translation type="unfinished">鍶</translation>
     </message>
@@ -286,3 +255,3 @@
         <source>Yttrium</source>
-        <translation>釔</translation>
+        <translation type="unfinished">釔</translation>
     </message>
@@ -290,3 +259,3 @@
         <source>Zirconium</source>
-        <translation>鋯</translation>
+        <translation type="unfinished">鋯</translation>
     </message>
@@ -294,3 +263,3 @@
         <source>Niobium</source>
-        <translation>鈮</translation>
+        <translation type="unfinished">鈮</translation>
     </message>
@@ -298,3 +267,3 @@
         <source>Molybdenum</source>
-        <translation>鉬</translation>
+        <translation type="unfinished">鉬</translation>
     </message>
@@ -302,3 +271,3 @@
         <source>Technetium</source>
-        <translation>鎝</translation>
+        <translation type="unfinished">鎝</translation>
     </message>
@@ -306,3 +275,3 @@
         <source>Ruthenium</source>
-        <translation>釕</translation>
+        <translation type="unfinished">釕</translation>
     </message>
@@ -310,3 +279,3 @@
         <source>Rhodium</source>
-        <translation>銠</translation>
+        <translation type="unfinished">銠</translation>
     </message>
@@ -314,3 +283,3 @@
         <source>Palladium</source>
-        <translation>鈀</translation>
+        <translation type="unfinished">鈀</translation>
     </message>
@@ -318,3 +287,3 @@
         <source>Silver</source>
-        <translation>銀</translation>
+        <translation type="unfinished">銀</translation>
     </message>
@@ -322,3 +291,3 @@
         <source>Cadmium</source>
-        <translation>鎘</translation>
+        <translation type="unfinished">鎘</translation>
     </message>
@@ -326,3 +295,3 @@
         <source>Indium</source>
-        <translation>銦</translation>
+        <translation type="unfinished">銦</translation>
     </message>
@@ -330,3 +299,3 @@
         <source>Tin</source>
-        <translation>錫</translation>
+        <translation type="unfinished">錫</translation>
     </message>
@@ -334,3 +303,3 @@
         <source>Antimony</source>
-        <translation>銻</translation>
+        <translation type="unfinished">銻</translation>
     </message>
@@ -338,3 +307,3 @@
         <source>Tellurium</source>
-        <translation>碲</translation>
+        <translation type="unfinished">碲</translation>
     </message>
@@ -342,3 +311,3 @@
         <source>Iodine</source>
-        <translation>碘</translation>
+        <translation type="unfinished">碘</translation>
     </message>
@@ -346,3 +315,3 @@
         <source>Xenon</source>
-        <translation>氙</translation>
+        <translation type="unfinished">氙</translation>
     </message>
@@ -350,3 +319,3 @@
         <source>Cesium</source>
-        <translation>銫</translation>
+        <translation type="unfinished">銫</translation>
     </message>
@@ -354,3 +323,3 @@
         <source>Barium</source>
-        <translation>鋇</translation>
+        <translation type="unfinished">鋇</translation>
     </message>
@@ -358,3 +327,3 @@
         <source>Lanthanum</source>
-        <translation>鑭</translation>
+        <translation type="unfinished">鑭</translation>
     </message>
@@ -362,3 +331,3 @@
         <source>Cerium</source>
-        <translation>鈰</translation>
+        <translation type="unfinished">鈰</translation>
     </message>
@@ -366,3 +335,3 @@
         <source>Praseodymium</source>
-        <translation>鐠</translation>
+        <translation type="unfinished">鐠</translation>
     </message>
@@ -370,3 +339,3 @@
         <source>Neodymium</source>
-        <translation>釹</translation>
+        <translation type="unfinished">釹</translation>
     </message>
@@ -374,3 +343,3 @@
         <source>Promethium</source>
-        <translation>鉅</translation>
+        <translation type="unfinished">鉅</translation>
     </message>
@@ -378,3 +347,3 @@
         <source>Samarium</source>
-        <translation>釤</translation>
+        <translation type="unfinished">釤</translation>
     </message>
@@ -382,3 +351,3 @@
         <source>Europium</source>
-        <translation>銪</translation>
+        <translation type="unfinished">銪</translation>
     </message>
@@ -386,3 +355,3 @@
         <source>Gadolinium</source>
-        <translation>釓</translation>
+        <translation type="unfinished">釓</translation>
     </message>
@@ -390,3 +359,3 @@
         <source>Terbium</source>
-        <translation>鋱</translation>
+        <translation type="unfinished">鋱</translation>
     </message>
@@ -394,3 +363,3 @@
         <source>Dysprosium</source>
-        <translation>鏑</translation>
+        <translation type="unfinished">鏑</translation>
     </message>
@@ -398,3 +367,3 @@
         <source>Holmium</source>
-        <translation>鈥</translation>
+        <translation type="unfinished">鈥</translation>
     </message>
@@ -402,3 +371,3 @@
         <source>Erbium</source>
-        <translation>鉺</translation>
+        <translation type="unfinished">鉺</translation>
     </message>
@@ -406,3 +375,3 @@
         <source>Thulium</source>
-        <translation>銩</translation>
+        <translation type="unfinished">銩</translation>
     </message>
@@ -410,3 +379,3 @@
         <source>Ytterbium</source>
-        <translation>鐿</translation>
+        <translation type="unfinished">鐿</translation>
     </message>
@@ -414,3 +383,3 @@
         <source>Lutetium</source>
-        <translation>鎦</translation>
+        <translation type="unfinished">鎦</translation>
     </message>
@@ -418,3 +387,3 @@
         <source>Hafnium</source>
-        <translation>鉿</translation>
+        <translation type="unfinished">鉿</translation>
     </message>
@@ -422,3 +391,3 @@
         <source>Tantalum</source>
-        <translation>鉭</translation>
+        <translation type="unfinished">鉭</translation>
     </message>
@@ -426,3 +395,3 @@
         <source>Tungsten</source>
-        <translation>鎢</translation>
+        <translation type="unfinished">鎢</translation>
     </message>
@@ -430,3 +399,3 @@
         <source>Rhenium</source>
-        <translation>錸</translation>
+        <translation type="unfinished">錸</translation>
     </message>
@@ -434,3 +403,3 @@
         <source>Osmium</source>
-        <translation>鋨</translation>
+        <translation type="unfinished">鋨</translation>
     </message>
@@ -438,3 +407,3 @@
         <source>Iridium</source>
-        <translation>銥</translation>
+        <translation type="unfinished">銥</translation>
     </message>
@@ -442,3 +411,3 @@
         <source>Platinum</source>
-        <translation>鉑</translation>
+        <translation type="unfinished">鉑</translation>
     </message>
@@ -446,3 +415,3 @@
         <source>Gold</source>
-        <translation>金</translation>
+        <translation type="unfinished">金</translation>
     </message>
@@ -450,3 +419,3 @@
         <source>Mercury</source>
-        <translation>汞</translation>
+        <translation type="unfinished">汞</translation>
     </message>
@@ -454,3 +423,3 @@
         <source>Thallium</source>
-        <translation>鉈</translation>
+        <translation type="unfinished">鉈</translation>
     </message>
@@ -458,3 +427,3 @@
         <source>Lead</source>
-        <translation>鉛</translation>
+        <translation type="unfinished">鉛</translation>
     </message>
@@ -462,3 +431,3 @@
         <source>Bismuth</source>
-        <translation>鉍</translation>
+        <translation type="unfinished">鉍</translation>
     </message>
@@ -466,3 +435,3 @@
         <source>Polonium</source>
-        <translation>釙</translation>
+        <translation type="unfinished">釙</translation>
     </message>
@@ -470,3 +439,3 @@
         <source>Astatine</source>
-        <translation>厄</translation>
+        <translation type="unfinished">厄</translation>
     </message>
@@ -474,3 +443,3 @@
         <source>Radon</source>
-        <translation>氡</translation>
+        <translation type="unfinished">氡</translation>
     </message>
@@ -478,3 +447,3 @@
         <source>Francium</source>
-        <translation>鈁</translation>
+        <translation type="unfinished">鈁</translation>
     </message>
@@ -482,3 +451,3 @@
         <source>Radium</source>
-        <translation>鐳</translation>
+        <translation type="unfinished">鐳</translation>
     </message>
@@ -486,3 +455,3 @@
         <source>Actinium</source>
-        <translation>錒</translation>
+        <translation type="unfinished">錒</translation>
     </message>
@@ -490,3 +459,3 @@
         <source>Thorium</source>
-        <translation>釷</translation>
+        <translation type="unfinished">釷</translation>
     </message>
@@ -494,3 +463,3 @@
         <source>Protactinium</source>
-        <translation>鏷</translation>
+        <translation type="unfinished">鏷</translation>
     </message>
@@ -498,3 +467,3 @@
         <source>Uranium</source>
-        <translation>鈾</translation>
+        <translation type="unfinished">鈾</translation>
     </message>
@@ -502,3 +471,3 @@
         <source>Neptunium</source>
-        <translation>錼</translation>
+        <translation type="unfinished">錼</translation>
     </message>
@@ -506,3 +475,3 @@
         <source>Plutonium</source>
-        <translation>鈽</translation>
+        <translation type="unfinished">鈽</translation>
     </message>
@@ -510,3 +479,3 @@
         <source>Americium</source>
-        <translation>鋂</translation>
+        <translation type="unfinished">鋂</translation>
     </message>
@@ -514,3 +483,3 @@
         <source>Curium</source>
-        <translation>鋦</translation>
+        <translation type="unfinished">鋦</translation>
     </message>
@@ -518,3 +487,3 @@
         <source>Berkelium</source>
-        <translation>(金北)</translation>
+        <translation type="unfinished">(金北)</translation>
     </message>
@@ -522,3 +491,3 @@
         <source>Californium</source>
-        <translation>鉲</translation>
+        <translation type="unfinished">鉲</translation>
     </message>
@@ -526,3 +495,3 @@
         <source>Einsteinium</source>
-        <translation>鑀</translation>
+        <translation type="unfinished">鑀</translation>
     </message>
@@ -530,3 +499,3 @@
         <source>Fermium</source>
-        <translation>鐨</translation>
+        <translation type="unfinished">鐨</translation>
     </message>
@@ -534,3 +503,3 @@
         <source>Mendelevium</source>
-        <translation>鍆</translation>
+        <translation type="unfinished">鍆</translation>
     </message>
@@ -538,3 +507,3 @@
         <source>Nobelium</source>
-        <translation>(金若)</translation>
+        <translation type="unfinished">(金若)</translation>
     </message>
@@ -542,3 +511,3 @@
         <source>Lawrencium</source>
-        <translation>鐒</translation>
+        <translation type="unfinished">鐒</translation>
     </message>
@@ -546,3 +515,3 @@
         <source>Rutherfordium</source>
-        <translation>鑪</translation>
+        <translation type="unfinished">鑪</translation>
     </message>
@@ -550,3 +519,3 @@
         <source>Dubnium</source>
-        <translation>(金杜)</translation>
+        <translation type="unfinished">(金杜)</translation>
     </message>
@@ -554,3 +523,3 @@
         <source>Seaborgium</source>
-        <translation>(金喜)</translation>
+        <translation type="unfinished">(金喜)</translation>
     </message>
@@ -558,3 +527,3 @@
         <source>Bohrium</source>
-        <translation>(金波)</translation>
+        <translation type="unfinished">(金波)</translation>
     </message>
@@ -562,3 +531,3 @@
         <source>Hassium</source>
-        <translation>(金黑)</translation>
+        <translation type="unfinished">(金黑)</translation>
     </message>
@@ -566,3 +535,26 @@
         <source>Meitnerium</source>
-        <translation>(金麥)</translation>
+        <translation type="unfinished">(金麥)</translation>
+    </message>
+</context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation>週期系統</translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation>錯誤: 
+</translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation>Chemical Data</translation>
     </message>