summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiloš Popović <mpopovic@src.gnome.org>2009-09-30 03:05:31 +0000
committerMiloš Popović <mpopovic@src.gnome.org>2009-09-30 03:05:31 +0000
commit0c88408218050b9a239e90d6585731aeb1a1c181 (patch)
treecc2f2816bb5a30ba5b7b5a25445b074a5d7c767e
parentb0adce8ab454c2c8e8da47019d510eac405e2452 (diff)
Updated Serbian translation
-rw-r--r--po/sr.po3
-rw-r--r--po/sr@latin.po3
2 files changed, 0 insertions, 6 deletions
diff --git a/po/sr.po b/po/sr.po
index fea7c3843..28ff36ce6 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -11,16 +11,13 @@
msgid ""
msgstr ""
"Project-Id-Version: 2.8\n"
-<<<<<<< HEAD
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-09-22 12:51-0400\n"
"PO-Revision-Date: 2007-09-06 21:11+0100\n"
-=======
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=glib&component=general\n"
"POT-Creation-Date: 2009-09-05 01:22+0000\n"
"PO-Revision-Date: 2009-09-30 02:59+0000\n"
->>>>>>> Updated Serbian translation
"Last-Translator: Милош Поповић <gpopac@gmail.com>\n"
"Language-Team: Serbian <gnome@prevod.org>\n"
"MIME-Version: 1.0\n"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index b645a87c2..5cd236108 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -11,16 +11,13 @@
msgid ""
msgstr ""
"Project-Id-Version: 2.8\n"
-<<<<<<< HEAD
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-09-22 12:51-0400\n"
"PO-Revision-Date: 2007-09-06 21:11+0100\n"
-=======
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=glib&component=general\n"
"POT-Creation-Date: 2009-09-05 01:22+0000\n"
"PO-Revision-Date: 2009-09-30 02:59+0000\n"
->>>>>>> Updated Serbian translation
"Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
"Language-Team: Serbian <gnome@prevod.org>\n"
"MIME-Version: 1.0\n"