|
1412.
|
|
|
merge strategy to use
|
|
|
|
sammanslagningsstrategi att använda
|
|
Translated by
Peter Krefting
|
|
Reviewed by
Josef Andersson
|
In upstream: |
|
sammanslagninsstrategi att använda
|
|
|
Suggested by
Peter Krefting
|
|
|
|
Located in
builtin/merge.c:280 builtin/pull.c:173
|
|
1463.
|
|
|
Trying merge strategy %s ...
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Försöker sammanslagningsstrategin %s ...
|
|
Translated by
Peter Krefting
|
|
Reviewed by
Josef Andersson
|
In upstream: |
|
Försöker sammanslagninsstrategin %s ...
|
|
|
Suggested by
Peter Krefting
|
|
|
|
Located in
builtin/merge.c:1668
|
|
1603.
|
|
|
similar to --all-progress when progress meter is shown
|
|
|
|
som --all-progress när förloppsindikatorn visas
|
|
Translated and reviewed by
Josef Andersson
|
In upstream: |
|
som --all-progress när förloppsmätaren visas
|
|
|
Suggested by
Peter Krefting
|
|
|
|
Located in
builtin/bundle.c:72 builtin/pack-objects.c:3883
|
|
1683.
|
|
|
--delete is incompatible with --all, --mirror and --tags
|
|
|
|
--delete är inkompatibel med --all, --mirror och --tags
|
|
Translated by
Peter Krefting
|
|
Reviewed by
Josef Andersson
|
In upstream: |
|
--delete är imkompatibel med --all, --mirror och --tags
|
|
|
Suggested by
Peter Krefting
|
|
|
|
Located in
builtin/push.c:592
|
|
1894.
|
|
|
merge strategy
|
|
|
|
sammanslagningsstrategi
|
|
Translated by
Peter Krefting
|
|
Reviewed by
Josef Andersson
|
In upstream: |
|
sammanslagninsstrategi
|
|
|
Suggested by
Peter Krefting
|
|
|
|
Located in
builtin/revert.c:114
|
|
1937.
|
|
|
show possible merge bases
|
|
|
|
visa möjliga sammanslagningsbaser
|
|
Translated by
Peter Krefting
|
|
Reviewed by
Josef Andersson
|
In upstream: |
|
visa möjliga sammanslaningsbaser
|
|
|
Suggested by
Peter Krefting
|
|
|
|
Located in
builtin/show-branch.c:659
|
|
2032.
|
|
|
add entries from standard input to the index
|
|
|
|
lägg poster från standard in till indexet
|
|
Translated by
Peter Krefting
|
|
Reviewed by
Josef Andersson
|
In upstream: |
|
lägg poster från från standard in till indexet
|
|
|
Suggested by
Peter Krefting
|
|
|
|
Located in
builtin/update-index.c:1032
|
|
2036.
|
|
|
report actions to standard output
|
|
|
|
rapportera åtgärder på standard ut
|
|
Translated by
Peter Krefting
|
|
Reviewed by
Josef Andersson
|
In upstream: |
|
raportera åtgärder på standard ut
|
|
|
Suggested by
Peter Krefting
|
|
|
|
Located in
builtin/update-index.c:1047
|
|
2092.
|
|
|
Using index info to reconstruct a base tree...
|
|
|
|
Använder indexinfo för att återskapa ett basträd...
|
|
Translated by
Peter Krefting
|
|
Reviewed by
Josef Andersson
|
In upstream: |
|
Använder indexinfo för att åteskapa ett basträd...
|
|
|
Suggested by
Peter Krefting
|
|
|
|
Located in
builtin/am.c:1541
|
|
2095.
|
|
|
Failed to merge in the changes.
|
|
|
|
Misslyckades slå ihop ändringarna.
|
|
Translated by
Peter Krefting
|
|
Reviewed by
Josef Andersson
|
In upstream: |
|
Misslyckads slå ihop ändringarna.
|
|
|
Suggested by
Peter Krefting
|
|
|
|
Located in
builtin/am.c:1592
|