Ubuntu
bzr package

Browsing Bosnian translation

  1. Quantal (12.10)
  2. Template “bzr”
  3. Bosnian (bs)
Don't show this notice anymore
Before translating, be sure to go through Ubuntu Translators instructions and Bosnian guidelines.

These translations are shared with Bazaar 2.6 series template bzr.

2025 → 2034 of 2353 results First • • • Last
2025.
$ bzr init
$ bzr mkdir white
$ bzr mkdir black
$ bzr commit -m "BASE"
$ bzr branch . ../other
$ bzr mv white black
$ bzr commit -m "THIS"
$ bzr mv ../other/black ../other/white
$ bzr commit ../other -m "OTHER"
$ bzr merge ../other
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
There are leading/trailing spaces here. Each one represents a space character. Enter a space in the equivalent position in the translation.
(no translation yet)
Translated by Samir Ribić
Reviewed by Samir Ribić
Shared:
$ bzr init
$ bzr mkdir white
$ bzr mkdir black
$ bzr commit -m "BASE"
$ bzr branch . ../other
$ bzr mv white black
$ bzr commit -m "THIS"
$ bzr mv ../other/black ../other/white
$ bzr commit ../other -m "OTHER"
$ bzr merge ../other
Suggested by Samir Ribić
Located in en/help_topics/conflict-types.txt:311
2026.
In this situation, Bazaar will cancel the move, and leave ``white`` in
``black``. To resolve that kind of conflict, you just have to decide what
name should be retained for the directories involved.
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
U toj situaciji, Bazaar će otkazati kretanje, i dopustiti ``white`` u ``black``. za rješenje tog tipa sukoba, Vi samo trebate odlučiti koje ime treba biti sačuvano za angažovane direktorije.
Translated by Maida
Reviewed by Samir Ribić
Located in en/help_topics/conflict-types.txt:322
2027.
* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white``
in ``black``,
* ``--action=take-other`` will revert Bazaar choice and move ``black`` in
``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,
* ``--action=done`` will just mark the conflict as resolved.
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
There are leading/trailing spaces here. Each one represents a space character. Enter a space in the equivalent position in the translation.
* ``--action=take-this`` će dopustiti Bazaar izbor dopuštanja ``white`` u ``black``,
* ``--action=take-other`` će vratiti bazaar izbor i premjestiti ``black`` u``white`` ispuštanjem ``bzr mv black/white white ; bzr mv black white``,
* ``--action=done`` će samo označiti sukob kao riješen.
Translated by Maida
Reviewed by Samir Ribić
Located in en/help_topics/conflict-types.txt:328
2028.
Non-directory parent
--------------------
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
Nije roditelj direktorija
--------------------
Translated by Dunja Bihorac
Reviewed by Samir Ribić
Located in en/help_topics/conflict-types.txt:336
2029.
Conflict: foo.new is not a directory, but has files in it.
Created directory.
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
There are leading/trailing spaces here. Each one represents a space character. Enter a space in the equivalent position in the translation.
Sukob: foo.novi nije direktorijum, ali ima datoteke u sebi.
Kreiran direktorij.
Translated by Dunja Bihorac
Reviewed by Samir Ribić
Located in en/help_topics/conflict-types.txt:341
2030.
This happens when one side has added files to a directory, and the other side
has changed the directory into a file or symlink. For example::
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
To se događa kada je jedna strana dodala datoteke u direktorij, i druga strana
je promijenika direktorij u datoteci ili link. Na primjer::
Translated by Almir Harba
Reviewed by Samir Ribić
In upstream:
Ovo se događa kada je jedna strana dodala datoteke u direktorij, a druga strana
promijenila direktorij u datoteku ili symlink. Na primjer::
Suggested by Armin
Located in en/help_topics/conflict-types.txt:344
2031.
$ bzr init
$ bzr mkdir foo
$ bzr commit -m "BASE"
$ bzr branch . ../other
$ rmdir foo
$ touch foo
$ bzr commit -m "THIS"
$ bzr mkdir ../other/foo/bar
$ bzr commit ../other -m "OTHER"
$ bzr merge ../other
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
There are leading/trailing spaces here. Each one represents a space character. Enter a space in the equivalent position in the translation.
$ bzr init
$ bzr mkdir foo
$ bzr commit -m "BASE"
$ bzr branch . ../other
$ rmdir foo
$ touch foo
$ bzr commit -m "THIS"
$ bzr mkdir ../other/foo/bar
$ bzr commit ../other -m "OTHER"
$ bzr merge ../other
Translated and reviewed by Samir Ribić
Located in en/help_topics/conflict-types.txt:347
2032.
To resolve that kind of conflict, you have to decide what name should be
retained for the file, directory or symlink involved.
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
Da biste riješili tu vrstu sukoba, morate odlučiti koje ime bi trebalo
zadržati za datoteku, direktorij ili uključeni symlink.
Translated by Armin
Reviewed by Samir Ribić
Located in en/help_topics/conflict-types.txt:358
2033.
* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and
``bzr add foo``,
* ``--action=take-other`` will issue ``bzr rm --force foo`` and
``bzr mv foo.new foo``,
* ``--action=done`` will just mark the conflict as resolved.
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
There are leading/trailing spaces here. Each one represents a space character. Enter a space in the equivalent position in the translation.
* ``--action=take-this`` će izdati ``bzr rm --force foo.new`` i
``bzr add foo``,
* ``--action=take-other``će izdati ``bzr rm --force foo`` i
``bzr mv foo.new foo``,
* ``--action=done``če obilježiti da je sukob riješen.
Translated and reviewed by Samir Ribić
Located in en/help_topics/conflict-types.txt:363
2034.
MalformedTransform
------------------
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
DeformisanaTransformacija
------------------
Translated by Dunja Bihorac
Reviewed by Samir Ribić
Located in en/help_topics/conflict-types.txt:371
2025 → 2034 of 2353 results First • • • Last

This translation is managed by Ubuntu Bosnia and Herzegovina translators, assigned by Ubuntu Translators.

You are not logged in. Please log in to work on translations.

Contributors to this translation: Adi, Afan, Almin Islamović, Almir Harba, Armin, Ashraf Gheth, Dunja Bihorac, Hamza Semic, Josip Kvesic, Maida, Samir Ribić, Tarik Radončić.