diff options
| author | l10n daemon script <[email protected]> | 2023-11-08 09:18:27 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-11-08 09:18:27 +0000 |
| commit | 3fde6cbeb0b2df48a91870c74c4ef74462a82058 (patch) | |
| tree | 8ec7df75dfc2fb7725fd8e796e10956b7c104441 /src/dolphinpartactions.desktop | |
| parent | 33d8c894f25958d3024bef8d9be3d9f880923056 (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/dolphinpartactions.desktop')
| -rw-r--r-- | src/dolphinpartactions.desktop | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop index 24ee78f7e..52cdf58c0 100644 --- a/src/dolphinpartactions.desktop +++ b/src/dolphinpartactions.desktop @@ -8,6 +8,7 @@ Actions=icons;details;compact; [Desktop Action icons] Name=Icons Name[ar]=الأيقونات +Name[ast]=Iconos Name[az]=İkonlar Name[be]=Значкі Name[bg]=Икони @@ -88,7 +89,7 @@ Name[eu]=Trinkoa Name[fi]=Tiivis Name[fr]=Concis Name[gl]=Compacta -Name[he]=חסכונית +Name[he]=מצומצמת Name[hi]=सघन Name[hu]=Kompakt Name[ia]=Compacte @@ -133,6 +134,7 @@ Exec=dolphin [Desktop Action details] Name=Details Name[ar]=التّفاصيل +Name[ast]=Detalles Name[az]=Ətraflı Name[be]=Падрабязы выгляд Name[bg]=Подробности |