Merge strings

1 files changed, 10 insertions, 11 deletions

diff --git a/po/bs.po b/po/bs.po
index bb3f17d0..970054a7 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-21 14:52+0200\n"
+"POT-Creation-Date: 2005-04-21 15:09+0200\n"
 "PO-Revision-Date: 2005-02-02 18:01+0100\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosanski <lokal@lugbih.org>\n"
@@ -1438,7 +1438,7 @@ msgstr ""
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --install-src  - instaliraj samo izvorne pakete (bez binarnih).\n"
 
-#: ../urpmi:88
+#: ../urpmi:88 ../urpmq:52
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2115,15 +2115,6 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../urpmq:52
-#, fuzzy, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - čuvaj postojeće pakete ako je moguće, odbaci tražene\n"
-"                   pakete koji vode uklanjanju.\n"
-
 #: ../urpmq:54
 #, c-format
 msgid "  --list         - list available packages.\n"
@@ -2274,6 +2265,14 @@ msgstr "Nije nađena lista datoteka\n"
 msgid "No changelog found\n"
 msgstr "Nije pronađen changelog\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "  --keep         - keep existing packages if possible, reject requested\n"
+#~ "                   packages that leads to remove.\n"
+#~ msgstr ""
+#~ "  --keep         - čuvaj postojeće pakete ako je moguće, odbaci tražene\n"
+#~ "                   pakete koji vode uklanjanju.\n"
+
 #~ msgid "unable to write file [%s]"
 #~ msgstr "ne mogu pisati u datoteku [%s]"