diff options
| author | l10n daemon script <[email protected]> | 2015-06-24 10:34:19 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-06-24 10:34:19 +0000 |
| commit | da7a6a16f8f95d4328215e6f708b051a66899d88 (patch) | |
| tree | b3453c56f05896c91a037db6f95eda1cf72c6ab6 /src/dolphinpart.desktop | |
| parent | b07a63797b36c504959d632ff839a7ced1249dc1 (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 586c9b15c..8c78d6e0b 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -29,6 +29,7 @@ Name[sr@ijekavian]=Делфинов приказ Name[sr@ijekavianlatin]=Dolphinov prikaz Name[sr@latin]=Dolphinov prikaz Name[sv]=Vy i Dolphin +Name[tr]=Dolphin Görünümü Name[uk]=Перегляд Dolphin Name[x-test]=xxDolphin Viewxx Name[zh_CN]=Dolphin 视图 @@ -76,6 +77,7 @@ Name[sr@ijekavian]=Иконе Name[sr@ijekavianlatin]=Ikone Name[sr@latin]=Ikone Name[sv]=Ikoner +Name[tr]=Simgeler Name[uk]=Піктограми Name[x-test]=xxIconsxx Name[zh_CN]=图标视图 @@ -111,6 +113,7 @@ Name[sr@ijekavian]=Сажето Name[sr@ijekavianlatin]=Sažeto Name[sr@latin]=Sažeto Name[sv]=Kompakt +Name[tr]=Sıkışık Name[uk]=Компактний Name[x-test]=xxCompactxx Name[zh_CN]=简洁视图 @@ -148,6 +151,7 @@ Name[sr@ijekavian]=Детаљи Name[sr@ijekavianlatin]=Detalji Name[sr@latin]=Detalji Name[sv]=Detaljinformation +Name[tr]=Ayrıntılar Name[uk]=Подробиці Name[x-test]=xxDetailsxx Name[zh_CN]=细节视图 |