mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +00:00
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
parent
25bfe6149e
commit
aac6a5245f
|
@ -6,6 +6,7 @@ Name[ast]=Vista de Dolphin
|
||||||
Name[az]=Dolphin görünüşü
|
Name[az]=Dolphin görünüşü
|
||||||
Name[ca]=Vista del Dolphin
|
Name[ca]=Vista del Dolphin
|
||||||
Name[ca@valencia]=Vista del Dolphin
|
Name[ca@valencia]=Vista del Dolphin
|
||||||
|
Name[cs]=Pohled Dolphin
|
||||||
Name[da]=Dolphin-visning
|
Name[da]=Dolphin-visning
|
||||||
Name[de]=Dolphin-Ansicht
|
Name[de]=Dolphin-Ansicht
|
||||||
Name[el]=Dolphin View
|
Name[el]=Dolphin View
|
||||||
|
@ -73,6 +74,7 @@ Name[ast]=Iconos
|
||||||
Name[az]=İkonlar
|
Name[az]=İkonlar
|
||||||
Name[ca]=Icones
|
Name[ca]=Icones
|
||||||
Name[ca@valencia]=Icones
|
Name[ca@valencia]=Icones
|
||||||
|
Name[cs]=Ikony
|
||||||
Name[da]=Ikoner
|
Name[da]=Ikoner
|
||||||
Name[de]=Symbole
|
Name[de]=Symbole
|
||||||
Name[el]=Εικονίδια
|
Name[el]=Εικονίδια
|
||||||
|
@ -127,6 +129,7 @@ Name[ast]=Compauta
|
||||||
Name[az]=Yığcam
|
Name[az]=Yığcam
|
||||||
Name[ca]=Compacta
|
Name[ca]=Compacta
|
||||||
Name[ca@valencia]=Compacta
|
Name[ca@valencia]=Compacta
|
||||||
|
Name[cs]=Kompaktní
|
||||||
Name[da]=Kompakt
|
Name[da]=Kompakt
|
||||||
Name[de]=Kompakt
|
Name[de]=Kompakt
|
||||||
Name[el]=Σύμπτυξη
|
Name[el]=Σύμπτυξη
|
||||||
|
@ -180,6 +183,7 @@ Name[ast]=Detalles
|
||||||
Name[az]=Ətraflı
|
Name[az]=Ətraflı
|
||||||
Name[ca]=Detalls
|
Name[ca]=Detalls
|
||||||
Name[ca@valencia]=Detalls
|
Name[ca@valencia]=Detalls
|
||||||
|
Name[cs]=Podrobnosti
|
||||||
Name[da]=Detaljer
|
Name[da]=Detaljer
|
||||||
Name[de]=Details
|
Name[de]=Details
|
||||||
Name[el]=Λεπτομέρειες
|
Name[el]=Λεπτομέρειες
|
||||||
|
|
Loading…
Reference in a new issue