diff options
| author | Lars Op den Kamp <lars@opdenkamp.eu> | 2011-01-04 12:45:56 +0100 |
|---|---|---|
| committer | Lars Op den Kamp <lars@opdenkamp.eu> | 2011-01-04 12:54:22 +0100 |
| commit | f9f5c75a784710732c316f248133a0e12ebc7f8d (patch) | |
| tree | fda97e8e9beec42659aa2db1f19d5ca8abf493c6 /language | |
| parent | 4a974cefffb96d253ccff5fc2cea377fde9064e4 (diff) | |
merge leftovers
Diffstat (limited to 'language')
| -rw-r--r-- | language/English/strings.xml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/language/English/strings.xml b/language/English/strings.xml index 6455e2ac0e..0c8694af3b 100644 --- a/language/English/strings.xml +++ b/language/English/strings.xml @@ -2605,15 +2605,6 @@ <string id="24089">Add-on restarts</string> <string id="24090">Lock Add-on manager</string> -<<<<<<< HEAD -======= - <string id="24091"></string> - <string id="24092"></string> - <string id="24093"></string> - <string id="24094"></string> - <string id="24095">Disabled System Add-on</string> - ->>>>>>> merge pvr-testing2 svn rev 32591 into trunk <string id="24096">Add-on has been marked as broken in repository.</string> <string id="24097">Would you like to disable it on your system?</string> <string id="24098">Broken</string> |