Remove diff conflicts.

This commit is contained in:
Duncan Mak 2002-09-10 18:56:07 +00:00
parent 419b29f5b4
commit 9ae52f1e46
2 changed files with 5 additions and 1 deletions

View File

@ -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> 2002-09-06 Frederic Crozat <fcrozat@mandrakesoft.com>
* fr.po: Updated French translation. * fr.po: Updated French translation.

View File

@ -367,7 +367,7 @@ msgstr "Întârzierea în milisecunde pentru opţiunea de ridicare automată"
#: src/metacity.schemas.in.h:28 #: src/metacity.schemas.in.h:28
msgid "Disable misfeatures that are required by old or broken applications" 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 #: src/metacity.schemas.in.h:29
msgid "Hide all windows and focus desktop" msgid "Hide all windows and focus desktop"