diff options
| author | Tom Ross <midgey@rockbox.org> | 2008-12-13 19:58:59 +0000 |
|---|---|---|
| committer | Tom Ross <midgey@rockbox.org> | 2008-12-13 19:58:59 +0000 |
| commit | b42f379fa3f354ccc94266604bd30ac4f7ad70de (patch) | |
| tree | 72734268c02cd2e7d61bddc285eda5e303c79c6e | |
| parent | fc7ba8806b77330b108709a5455b9a261d6b29e7 (diff) | |
| download | rockbox-b42f379fa3f354ccc94266604bd30ac4f7ad70de.zip rockbox-b42f379fa3f354ccc94266604bd30ac4f7ad70de.tar.gz rockbox-b42f379fa3f354ccc94266604bd30ac4f7ad70de.tar.bz2 rockbox-b42f379fa3f354ccc94266604bd30ac4f7ad70de.tar.xz | |
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
| -rw-r--r-- | apps/lang/srpski.lang | 15 |
1 files 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: |