diff MoinMoin/theme/__init__.py @ 1746:1aa9dfd0ad34

added conflict and rename icon
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 18 Jan 2007 10:08:26 +0100
parents 5e870f4e5d2e
children b7e0a36a1219
line wrap: on
line diff
--- a/MoinMoin/theme/__init__.py	Sat Jan 13 23:43:37 2007 +0100
+++ b/MoinMoin/theme/__init__.py	Thu Jan 18 10:08:26 2007 +0100
@@ -50,8 +50,8 @@
         'rss':        (_("[RSS]"),               "moin-rss.png",    36, 14),
         'deleted':    (_("[DELETED]"),           "moin-deleted.png",60, 12),
         'updated':    (_("[UPDATED]"),           "moin-updated.png",60, 12),
-        'renamed':    (_("[RENAMED]"),           "moin-updated.png",60, 12), # XXX need new icon
-        'conflict':   (_("[CONFLICT]"),          "alert.png", 15, 15),       # XXX need new icon
+        'renamed':    (_("[RENAMED]"),           "moin-renamed.png",60, 12),
+        'conflict':   (_("[CONFLICT]"),          "moin-conflict.png", 60, 12),
         'new':        (_("[NEW]"),               "moin-new.png",    31, 12),
         'diffrc':     (_("[DIFF]"),              "moin-diff.png",   15, 11),
         # General