diff options
| author | l10n daemon script <[email protected]> | 2020-09-03 06:10:45 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-03 06:10:45 +0200 |
| commit | a1d5d75bea304aad11eb4ae08198f552e7f8f0a1 (patch) | |
| tree | e4a75d6715b1081995f1e4d76b2f7bd235e5c98c /src/dolphinpart.desktop | |
| parent | 745fdeece31af9d9b7a64a0ad8cfc04d1a759864 (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/dolphinpart.desktop')
| -rw-r--r-- | src/dolphinpart.desktop | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 5865b0acf..33d8dd97e 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -45,6 +45,7 @@ Name[sr@latin]=Dolphinov prikaz Name[sv]=Vy i Dolphin Name[tr]=Dolphin Görünümü Name[uk]=Перегляд Dolphin +Name[vi]=Khung xem Dolphin Name[x-test]=xxDolphin Viewxx Name[zh_CN]=Dolphin 视图 Name[zh_TW]=Dolphin 檢視 @@ -108,6 +109,7 @@ Name[sr@latin]=Ikonice Name[sv]=Ikoner Name[tr]=Simgeler Name[uk]=Піктограми +Name[vi]=Biểu tượng Name[x-test]=xxIconsxx Name[zh_CN]=图标 Name[zh_TW]=圖示 @@ -161,6 +163,7 @@ Name[sr@latin]=Sažeto Name[sv]=Kompakt Name[tr]=Sıkışık Name[uk]=Компактний +Name[vi]=Gọn Name[x-test]=xxCompactxx Name[zh_CN]=紧凑 Name[zh_TW]=簡潔模式 @@ -214,6 +217,7 @@ Name[sr@latin]=Detalji Name[sv]=Detaljinformation Name[tr]=Ayrıntılar Name[uk]=Подробиці +Name[vi]=Chi tiết Name[x-test]=xxDetailsxx Name[zh_CN]=详细 Name[zh_TW]=詳細模式 |