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: [PATCH] Remove diff conflicts.

---
 po/ChangeLog | 4 ++++
 po/ro.po     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index 0864e770b..7689b843a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-11  Duncan Mak  <duncan@ximian.com>
+
+	* ro.po: Remove diff conflicts.
+
 2002-09-06  Frederic Crozat  <fcrozat@mandrakesoft.com>
 
 	* fr.po: Updated French translation.
diff --git a/po/ro.po b/po/ro.po
index 028cf9ecf..733ee0152 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"