summaryrefslogtreecommitdiff
path: root/po/POTFILES.in
diff options
context:
space:
mode:
authorDanilo Šegan <dsegan@gmx.net>2003-10-15 16:35:58 +0000
committerDanilo Šegan <danilo@src.gnome.org>2003-10-15 16:35:58 +0000
commit8af97d7f0434142de19e51bb67d40d5ec20e1397 (patch)
treee83f41c4eba2bc0ceb55cfea682151ffce7d1c1f /po/POTFILES.in
parent2d9c36d0cbe37a73710e8d56b67d472049b38ab9 (diff)
downloadnautilus-8af97d7f0434142de19e51bb67d40d5ec20e1397.tar.gz
Updated Serbian translation.
2003-10-15 Danilo Šegan <dsegan@gmx.net> * sr.po, sr@Latn.po: Updated Serbian translation. * POTFILES.in: Updated (someone [me?] missed the conflict markers).
Diffstat (limited to 'po/POTFILES.in')
-rw-r--r--po/POTFILES.in4
1 files changed, 0 insertions, 4 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 23e8f4463..fb962f22c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -115,12 +115,8 @@ src/nautilus-shell.c
src/nautilus-side-pane.c
src/nautilus-sidebar-title.c
src/nautilus-simple-search-bar.c
-<<<<<<< POTFILES.in
-src/nautilus-spatial-window.c
-=======
src/nautilus-spatial-window-ui.xml
src/nautilus-spatial-window.c
->>>>>>> 1.132
src/nautilus-switchable-search-bar.c
src/nautilus-view-frame.c
src/nautilus-window-manage-views.c