CVS update: /cs/po/sfx2/source/, /cs/po/svtools/source/

[xrambous]

User: xrambous
Date: 2008-03-10 21:41:02+0000
Modified:
   cs/po/sfx2/source/doc.po
   cs/po/svtools/source/misc.po

Log:
 

File Changes:

Directory: /cs/po/sfx2/source/
==============================

File [changed]: doc.po
Url: 
http://cs.openoffice.org/source/browse/cs/po/sfx2/source/doc.po?r1=1.37&r2=1.38
Delta lines:  +0 -4
-------------------
--- doc.po      2008-03-10 21:40:21+0000        1.37
+++ doc.po      2008-03-10 21:40:59+0000        1.38
@@ -433,11 +433,7 @@
 
 #: doc.src#STR_SHARED.string.text
 msgid " (shared)"
-<<<<<<< doc.po
-msgstr " (sdílený)"
-=======
 msgstr " (sdíleno)"
->>>>>>> 1.36
 
 #: doctdlg.src#DLG_DOC_TEMPLATE.FL_EDIT.fixedline.text
 msgid "New template"

Directory: /cs/po/svtools/source/
=================================

File [changed]: misc.po
Url: 
http://cs.openoffice.org/source/browse/cs/po/svtools/source/misc.po?r1=1.36&r2=1.37
Delta lines:  +0 -11
--------------------
--- misc.po     2008-03-10 21:40:21+0000        1.36
+++ misc.po     2008-03-10 21:40:59+0000        1.37
@@ -1776,11 +1776,7 @@
 
 #: 
langtab.src#STR_ARR_SVT_LANGUAGE_TABLE.LANGUAGE_GUARANI_PARAGUAY.pairedlist.text
 msgid "Guaraní, Paraguayan"
-<<<<<<< misc.po
-msgstr "Guaraní, Paraguaysky"
-=======
 msgstr "Guaraní, Paraguayan"
->>>>>>> 1.35
 
 #: 
langtab.src#STR_ARR_SVT_LANGUAGE_TABLE.LANGUAGE_USER_BODO_INDIA.pairedlist.text
 msgid "Bodo"
@@ -1805,10 +1801,3 @@
 #: langtab.src#STR_ARR_SVT_LANGUAGE_TABLE.LANGUAGE_TURKMEN.pairedlist.text
 msgid "Turkmen"
 msgstr "Turkmen"
-<<<<<<< misc.po
-
-#~ msgid "Tetun"
-#~ msgstr "Tetunsky"
-
-=======
->>>>>>> 1.35




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]