diff options
| author | l10n daemon script <[email protected]> | 2022-10-20 02:11:03 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-10-20 02:11:03 +0000 |
| commit | 3333246dba8df1da7f0e735c7816efbce270c96a (patch) | |
| tree | b8ae20ea3aeac484dbccdfc5da09f227c3108eff /src/dolphinpartactions.desktop | |
| parent | 58ff9c9cc8f6023f484fd4dbf436e4f598b9fad4 (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 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop index 595df530b..ed96c55e7 100644 --- a/src/dolphinpartactions.desktop +++ b/src/dolphinpartactions.desktop @@ -8,7 +8,6 @@ Actions=icons;details;compact; [Desktop Action icons] Name=Icons Name[ar]=الأيقونات -Name[ast]=Iconos Name[az]=İkonlar Name[bg]=Икони Name[ca]=Icones @@ -69,7 +68,6 @@ Exec=dolphin [Desktop Action compact] Name=Compact Name[ar]=متراصّ -Name[ast]=Compauta Name[az]=Yığcam Name[bg]=Компактен Name[ca]=Compacta @@ -129,7 +127,6 @@ Exec=dolphin [Desktop Action details] Name=Details Name[ar]=التّفاصيل -Name[ast]=Detalles Name[az]=Ətraflı Name[bg]=Подробности Name[ca]=Detalls |