use translations from BRANCH

9 files changed, 590 insertions, 64 deletions

diff --git a/i18n/mk/advancedfm.ts b/i18n/mk/advancedfm.ts
index 8df713f..b4dd404 100644
--- a/i18n/mk/advancedfm.ts
+++ b/i18n/mk/advancedfm.ts
@@ -129,11 +129,11 @@ It is not bookmarked!</source>
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Префрлисе на локална листа</translation>
+        <translation type="obsolete">Префрлисе на локална листа</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Префрли се на Далечинска листа
+        <translation type="obsolete">Префрли се на Далечинска листа
 </translation>
     </message>
     <message>
@@ -267,6 +267,26 @@ Do you really want to delete it?</source>
         <source>Could not rename</source>
         <translation>Неможе да се преименува</translation>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -356,5 +376,9 @@ Finished
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/calculator.ts b/i18n/mk/calculator.ts
index 296f72b..03a5e34 100644
--- a/i18n/mk/calculator.ts
+++ b/i18n/mk/calculator.ts
@@ -134,4 +134,203 @@
         <translation>Калкулатор</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished">Стандарден</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/datebook.ts b/i18n/mk/datebook.ts
index 2692ebf..f5e151f 100644
--- a/i18n/mk/datebook.ts
+++ b/i18n/mk/datebook.ts
@@ -366,14 +366,6 @@ Quit anyway?</source>
     </message>
 </context>
 <context>
-    <name>DateBookWeekLstDayHdr</name>
-    <message>
-        <source>MTWTFSSM</source>
-        <comment>Week days</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
@@ -531,7 +523,7 @@ Quit anyway?</source>
     </message>
     <message>
         <source>Start time</source>
-        <translation>Време на почеток</translation>
+        <translation type="obsolete">Време на почеток</translation>
     </message>
     <message>
         <source>All day</source>
@@ -569,6 +561,10 @@ Quit anyway?</source>
         <source>Note...</source>
         <translation>Забелешка...</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished">Време на почеток</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/mk/libbatteryapplet.ts b/i18n/mk/libbatteryapplet.ts
index 1201f24..42b68fc 100644
--- a/i18n/mk/libbatteryapplet.ts
+++ b/i18n/mk/libbatteryapplet.ts
@@ -81,5 +81,17 @@
         <source>No jacket with battery inserted</source>
         <translation>Нема додатна батерија</translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libqpe.ts b/i18n/mk/libqpe.ts
index 89b24fa..b4bad0b 100644
--- a/i18n/mk/libqpe.ts
+++ b/i18n/mk/libqpe.ts
@@ -861,6 +861,22 @@ Free some memory and try again.</source>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Грешка</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/mk/mailit.ts b/i18n/mk/mailit.ts
index 4e9462e..3c44535 100644
--- a/i18n/mk/mailit.ts
+++ b/i18n/mk/mailit.ts
@@ -200,6 +200,19 @@ associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/mk/opieftp.ts b/i18n/mk/opieftp.ts
index 00e7b65..ac2ab78 100644
--- a/i18n/mk/opieftp.ts
+++ b/i18n/mk/opieftp.ts
@@ -241,5 +241,9 @@ It must be empty</source>
         <source>Sorry name already taken</source>
         <translation>Името веќе постои</translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/qpe.ts b/i18n/mk/qpe.ts
index 73c5145..3985967 100644
--- a/i18n/mk/qpe.ts
+++ b/i18n/mk/qpe.ts
@@ -1,17 +1,79 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished">Проблем со апликацијата</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application terminated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation>Проблем со апликацијата</translation>
+        <translation type="obsolete">Проблем со апликацијата</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -19,27 +81,27 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation>Кликни на крстовите цврсто и 
+        <translation type="obsolete">Кликни на крстовите цврсто и 
 прецизно за да го калибрираш екранот.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Добредојде во Opie</translation>
+        <translation type="obsolete">Добредојде во Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation>Документи</translation>
+        <translation type="obsolete">Документи</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation>Преглед по икони</translation>
+        <translation type="obsolete">Преглед по икони</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation>Преглед по листа</translation>
+        <translation type="obsolete">Преглед по листа</translation>
     </message>
 </context>
 <context>
@@ -47,210 +109,380 @@ accurately to calibrate your screen.</source>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>Нивото на батеријата е критично!</translation>
+        <translation type="obsolete">Нивото на батеријата е критично!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
-        <translation>Нивото на батеријата е многу ниско.</translation>
+        <translation type="obsolete">Нивото на батеријата е многу ниско.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>Помошната батерија е многу слаба.
+        <translation type="obsolete">Помошната батерија е многу слаба.
 Наполни ја помошната батерија.</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation>Визиткарта</translation>
+        <translation type="obsolete">Визиткарта</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished">Информации</translation>
+        <translation type="obsolete">Информации</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;Датумот на системот не е валиден.
+        <translation type="obsolete">&lt;p&gt;Датумот на системот не е валиден.
 (%1)&lt;/p&gt;&lt;p&gt;Да се поправи саатот ? &lt;/p&gt;</translation>
     </message>
 </context>
 <context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished">Состојба на батерија</translation>
+    </message>
+    <message>
+        <source>Low Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FirstUse</name>
+    <message>
+        <source>&lt;&lt; Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next &gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation>Стартувач</translation>
+        <translation type="unfinished">Стартувач</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation>Барање документи</translation>
+        <translation type="obsolete">Барање документи</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation>Пребарување на документи</translation>
+        <translation type="obsolete">Пребарување на документи</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation>- Стартувач</translation>
+        <translation type="unfinished">- Стартувач</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation>Нема Апликација</translation>
+        <translation type="unfinished">Нема Апликација</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation>&lt;p&gt;Нема апликација дефинирана за овој документ.&lt;p&gt;Типот е %1.</translation>
+        <translation type="unfinished">&lt;p&gt;Нема апликација дефинирана за овој документ.&lt;p&gt;Типот е %1.</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished">Документи</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherTabWidget</name>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished">Преглед по икони</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished">Преглед по листа</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation>%1 датотеки</translation>
+        <translation type="obsolete">%1 датотеки</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation>Аите типови на датотека</translation>
+        <translation type="obsolete">Аите типови на датотека</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation>Преглед на документи</translation>
+        <translation type="unfinished">Преглед на документи</translation>
+    </message>
+    <message>
+        <source>All types</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation>Внесен медиум</translation>
+        <translation type="obsolete">Внесен медиум</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation>А &lt;b&gt;медиумот&lt;/b&gt;  е внесен. Да се скенира за мултимедијални датотеки?</translation>
+        <translation type="obsolete">А &lt;b&gt;медиумот&lt;/b&gt;  е внесен. Да се скенира за мултимедијални датотеки?</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Кои датотеки</translation>
+        <translation type="obsolete">Кои датотеки</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>Аудио</translation>
+        <translation type="obsolete">Аудио</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>Слика</translation>
+        <translation type="obsolete">Слика</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Текст</translation>
+        <translation type="obsolete">Текст</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>Видео</translation>
+        <translation type="obsolete">Видео</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Сите</translation>
+        <translation type="obsolete">Сите</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation>Поврзи апликации</translation>
+        <translation type="obsolete">Поврзи апликации</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation>Ограничи пребарување надиректориум: (сеуште не се користи)</translation>
+        <translation type="obsolete">Ограничи пребарување надиректориум: (сеуште не се користи)</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>Додај</translation>
+        <translation type="obsolete">Додај</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation>Твојата одлука ќе биде снимена на медиумот.</translation>
+        <translation type="obsolete">Твојата одлука ќе биде снимена на медиумот.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation>Не го барај овој медиум пак</translation>
+        <translation type="obsolete">Не го барај овој медиум пак</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
-        <translation>Состојба на батерија</translation>
+        <translation type="obsolete">Состојба на батерија</translation>
+    </message>
+</context>
+<context>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">Информации</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Датумот на системот не е валиден.
+(%1)&lt;/p&gt;&lt;p&gt;Да се поправи саатот ? &lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished">Нивото на батеријата е критично!</translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished">Помошната батерија е многу слаба.
+Наполни ја помошната батерија.</translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished">Визиткарта</translation>
+    </message>
+    <message>
+        <source>Battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Low
+Please save data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
-        <translation>Изгаси...</translation>
+        <translation type="unfinished">Изгаси...</translation>
     </message>
     <message>
         <source>Terminate</source>
-        <translation>Исклучи</translation>
+        <translation type="unfinished">Исклучи</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation>Исклучи Opie</translation>
+        <translation type="unfinished">Исклучи Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation>Рестартирај</translation>
+        <translation type="unfinished">Рестартирај</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation>Рестартирај Opie</translation>
+        <translation type="unfinished">Рестартирај Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation>Изгаси</translation>
+        <translation type="unfinished">Изгаси</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation>&lt;p&gt;
+        <translation type="unfinished">&lt;p&gt;
 Овие иоции за гасење се наменети за користење за време на развој и тестирање на Опие системот. Во нормална околина, овие концепти се непотребни.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Откажи</translation>
+        <translation type="unfinished">Откажи</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation>Врска за синхронизирање</translation>
+        <translation type="unfinished">Врска за синхронизирање</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>&lt;p&gt;Неавторизиран систем бара да се поврзе со овој уред.&lt;p&gt;Aко користите веризја на Qtopia постара од 1.5.1 надградете ја.</translation>
+        <translation type="unfinished">&lt;p&gt;Неавторизиран систем бара да се поврзе со овој уред.&lt;p&gt;Aко користите веризја на Qtopia постара од 1.5.1 надградете ја.</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation>Одбиј</translation>
+        <translation type="unfinished">Одбиј</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation>&lt;p&gt;Непознат систем бара да се поврзе со овој уред.&lt;p&gt;Aко првпат го имате инсталирано Sync ова е нормално.</translation>
+        <translation type="unfinished">&lt;p&gt;Непознат систем бара да се поврзе со овој уред.&lt;p&gt;Aко првпат го имате инсталирано Sync ова е нормално.</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation>Дозволи</translation>
+        <translation type="unfinished">Дозволи</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
-        <translation>Синхронизирање</translation>
+        <translation type="obsolete">Синхронизирање</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Контакти&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Контакти&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Откажи</translation>
+        <translation type="obsolete">&amp;Откажи</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syncing:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/showimg.ts b/i18n/mk/showimg.ts
index d578f90..81c2d9a 100644
--- a/i18n/mk/showimg.ts
+++ b/i18n/mk/showimg.ts
@@ -121,6 +121,36 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>