From b42f379fa3f354ccc94266604bd30ac4f7ad70de Mon Sep 17 00:00:00 2001
From: Tom Ross <midgey@rockbox.org>
Date: Sat, 13 Dec 2008 19:58:59 +0000
Subject: Fix some errors in the Serbian translation and bring it up to date
 (no translation changes).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19427 a1c6a512-1295-4272-9138-f99709370657
---
 apps/lang/srpski.lang | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index df185c7..4057080 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -3835,29 +3835,26 @@
   </voice>
 </phrase>
 <phrase>
-<<<<<<< .mine
   id: LANG_BUTTONLIGHT_TIMEOUT
   desc: in settings_menu
   user:
   <source>
     *: none
-    e200*: "Wheel Light Timeout"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
+    button_light: "Button Light Timeout"
+    fuze,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
-    e200*: "Тајмаут светла за точак"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Тајмаут светла за дугмиће"
+    button_light: "Тајмаут светла за дугмиће"
+    fuze,e200*: "Тајмаут светла за точак"
   </dest>
   <voice>
     *: none
-    e200*: "Тајмаут светла за точак"
-    clip,c200,gigabeatf,mrobe100,sa9200: "Тајмаут светла за дугмиће"
+    button_light: "Тајмаут светла за дугмиће"
+    fuze,e200*: "Тајмаут светла за точак"
   </voice>
 </phrase>
 <phrase>
-=======
->>>>>>> .r19300
   id: LANG_BUTTONLIGHT_BRIGHTNESS
   desc: in settings_menu
   user:
-- 
cgit v1.1