summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorAlessio Lenzi <lenzone10@rockbox.org>2008-01-09 21:38:05 +0000
committerAlessio Lenzi <lenzone10@rockbox.org>2008-01-09 21:38:05 +0000
commit81cf8b4d3bc4579b90a6fc4a97e61cc3acfc8c95 (patch)
tree551f46fc93252ae5e43a510b2063130c89663bd5 /apps
parent0d8fd456cd690a10f4935febc80fa0a4c8d7535d (diff)
downloadrockbox-81cf8b4d3bc4579b90a6fc4a97e61cc3acfc8c95.zip
rockbox-81cf8b4d3bc4579b90a6fc4a97e61cc3acfc8c95.tar.gz
rockbox-81cf8b4d3bc4579b90a6fc4a97e61cc3acfc8c95.tar.bz2
rockbox-81cf8b4d3bc4579b90a6fc4a97e61cc3acfc8c95.tar.xz
Oops, my previous commit was incorrect. Committed wrong file.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16041 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/lang/italiano.lang16
1 files changed, 0 insertions, 16 deletions
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index fe024e2..4bbc971 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -11467,22 +11467,6 @@
ipodvideo: "Taglio Alti"
</voice>
</phrase>
-<<<<<<< .mine
-<phrase>
- id: LANG_TAGNAVI_RANDOM
- desc: "<Random>" entry in tag browser
- user:
- <source>
- *: "<Random>"
- </source>
- <dest>
- *: "<Casuale>"
- </dest>
- <voice>
- *: "Casuale"
- </voice>
-</phrase>
-=======
<phrase>
id: LANG_TAGNAVI_RANDOM
desc: "<Random>" entry in tag browser