1
0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +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:
l10n daemon script 2021-01-21 07:07:06 +01:00
parent 25bfe6149e
commit aac6a5245f

View File

@ -6,6 +6,7 @@ Name[ast]=Vista de Dolphin
Name[az]=Dolphin görünüşü
Name[ca]=Vista del Dolphin
Name[ca@valencia]=Vista del Dolphin
Name[cs]=Pohled Dolphin
Name[da]=Dolphin-visning
Name[de]=Dolphin-Ansicht
Name[el]=Dolphin View
@ -73,6 +74,7 @@ Name[ast]=Iconos
Name[az]=İkonlar
Name[ca]=Icones
Name[ca@valencia]=Icones
Name[cs]=Ikony
Name[da]=Ikoner
Name[de]=Symbole
Name[el]=Εικονίδια
@ -127,6 +129,7 @@ Name[ast]=Compauta
Name[az]=Yığcam
Name[ca]=Compacta
Name[ca@valencia]=Compacta
Name[cs]=Kompaktní
Name[da]=Kompakt
Name[de]=Kompakt
Name[el]=Σύμπτυξη
@ -180,6 +183,7 @@ Name[ast]=Detalles
Name[az]=Ətraflı
Name[ca]=Detalls
Name[ca@valencia]=Detalls
Name[cs]=Podrobnosti
Name[da]=Detaljer
Name[de]=Details
Name[el]=Λεπτομέρειες