Merge from BRANCH_1_0.

1 files changed, 25 insertions, 20 deletions

diff --git a/i18n/no/clock.ts b/i18n/no/clock.ts
index bd9e904..7a06907 100644
--- a/i18n/no/clock.ts
+++ b/i18n/no/clock.ts
@@ -5,3 +5,3 @@
         <source>Snooze</source>
-        <translation type="unfinished"></translation>
+        <translation>Blunde</translation>
     </message>
@@ -9,3 +9,3 @@
         <source>PM</source>
-        <translation type="unfinished"></translation>
+        <translation>PM</translation>
     </message>
@@ -13,3 +13,3 @@
         <source>Clock</source>
-        <translation type="unfinished"></translation>
+        <translation>Klokke</translation>
     </message>
@@ -17,3 +17,3 @@
         <source>Stopwatch</source>
-        <translation type="unfinished"></translation>
+        <translation>Stoppeklokke</translation>
     </message>
@@ -21,3 +21,3 @@
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Start</translation>
     </message>
@@ -25,3 +25,3 @@
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>Nullstill</translation>
     </message>
@@ -29,3 +29,3 @@
         <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>Still inn alarm</translation>
     </message>
@@ -33,3 +33,3 @@
         <source>Set date and time.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sett dato og tid.</translation>
     </message>
@@ -37,3 +37,3 @@
         <source>Alarm Is On</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarm PÅ</translation>
     </message>
@@ -41,3 +41,3 @@
         <source>Alarm Is Off</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarm AV</translation>
     </message>
@@ -45,3 +45,3 @@
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Stopp</translation>
     </message>
@@ -49,2 +49,6 @@
         <source>Clock: Alarm was missed.</source>
+        <translation>Klokke: Alarm ble oversett.</translation>
+    </message>
+    <message>
+        <source>Alarm set: %1</source>
         <translation type="unfinished"></translation>
@@ -56,3 +60,3 @@
         <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>Still inn alarm</translation>
     </message>
@@ -60,3 +64,3 @@
         <source>Hour</source>
-        <translation type="unfinished"></translation>
+        <translation>Time</translation>
     </message>
@@ -64,3 +68,3 @@
         <source>Minute</source>
-        <translation type="unfinished"></translation>
+        <translation>Minutter</translation>
     </message>
@@ -68,3 +72,3 @@
         <source>AM</source>
-        <translation type="unfinished"></translation>
+        <translation>AM</translation>
     </message>
@@ -72,3 +76,3 @@
         <source>PM</source>
-        <translation type="unfinished"></translation>
+        <translation>PM</translation>
     </message>
@@ -76,3 +80,3 @@
         <source>mp3 alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>mp3 alarm</translation>
     </message>
@@ -81,3 +85,4 @@
 (minutes)</source>
-        <translation type="unfinished"></translation>
+        <translation>Utsett
+(minutter)</translation>
     </message>
@@ -85,3 +90,3 @@
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
@@ -89,3 +94,3 @@
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Lyd</translation>
     </message>