From 9ae52f1e46e565451740710263ac9acc8fff2f0e Mon Sep 17 00:00:00 2001
From: Duncan Mak <duncan@src.gnome.org>
Date: Tue, 10 Sep 2002 18:56:07 +0000
Subject: Remove diff conflicts.

---
 po/ro.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'po/ro.po')

diff --git a/po/ro.po b/po/ro.po
index 028cf9e..733ee01 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -367,7 +367,7 @@ msgstr "Întârzierea în milisecunde pentru opţiunea de ridicare automată"
 
 #: src/metacity.schemas.in.h:28
 msgid "Disable misfeatures that are required by old or broken applications"
-msgstr ""
+msgstr "Dezactivează care sunt cerute de aplicaţiile vechi sau stricate"
 
 #: src/metacity.schemas.in.h:29
 msgid "Hide all windows and focus desktop"
-- 
cgit v1.1