diff options
| author | l10n daemon script <[email protected]> | 2021-01-21 07:07:06 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-01-21 07:07:06 +0100 |
| commit | aac6a5245f48194828283fe5ed81a212ede6bc3c (patch) | |
| tree | 6f2506c43ddaf8d9a17fd32976ae2227f120b9c5 /src | |
| parent | 25bfe6149e729006bdad6bf2a38ebbb3fd188c8e (diff) | |
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"
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphinpart.desktop.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dolphinpart.desktop.in b/src/dolphinpart.desktop.in index 642ce15e0..71690ead9 100644 --- a/src/dolphinpart.desktop.in +++ b/src/dolphinpart.desktop.in @@ -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]=Λεπτομέρειες |