diff options
| author | l10n daemon script <[email protected]> | 2023-01-02 02:34:18 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-01-02 02:34:18 +0000 |
| commit | d11d4781487243dddc3a3899bd65d21542a93383 (patch) | |
| tree | e4221185daeb79c8b8c944576bbc6ce5c6ebdcde /src/dolphinpartactions.desktop | |
| parent | dccd8c4899e2811960f60c825ddf433ce174b372 (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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop index 8e7523daf..481ee6f40 100644 --- a/src/dolphinpartactions.desktop +++ b/src/dolphinpartactions.desktop @@ -30,7 +30,7 @@ Name[hu]=Ikonok Name[ia]=Icones Name[id]=Ikon Name[ie]=Icones -Name[is]=Táknmyndir +Name[is]=Tákn Name[it]=Icone Name[ja]=アイコン Name[ka]=ხატულები @@ -92,7 +92,7 @@ Name[hu]=Kompakt Name[ia]=Compacte Name[id]=Ringkas Name[ie]=Compact -Name[is]=Þjappað +Name[is]=Þétt Name[it]=Compatta Name[ja]=コンパクト Name[ka]=დაპატარავება @@ -153,7 +153,7 @@ Name[hu]=Részletek Name[ia]=Detalios Name[id]=Perincian Name[ie]=Detallies -Name[is]=Nánar +Name[is]=Ítarlegt Name[it]=Dettagli Name[ja]=詳細 Name[ka]=დეტალები |