diff options
| author | l10n daemon script <[email protected]> | 2015-05-05 14:00:14 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-05-05 14:00:14 +0000 |
| commit | c1a2c0f1a76dd1df7109d11a9f511b8c33d85054 (patch) | |
| tree | 276378cbbfa4b733c3003bdede1059bd76a92721 /src/dolphinpart.desktop | |
| parent | f1c5cd302ad382613edc0a1cb2c88bcb2a670b95 (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 08734f814..39953da62 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -12,6 +12,7 @@ Name[id]=Tampilan Dolphin Name[it]=Vista di Dolphin Name[ja]=Dolphin ビュー Name[ko]=Dolphin 보기 +Name[lt]=Dolphin žiūryklė Name[nb]=Dolphin visning Name[nl]=Dolphin-weergave Name[nn]=Dolphin-vising @@ -55,6 +56,7 @@ Name[id]=Ikon Name[it]=Icone Name[ja]=アイコン Name[ko]=아이콘 +Name[lt]=Piktogramos Name[nb]=Ikoner Name[nl]=Pictogrammen Name[nn]=Ikon @@ -88,6 +90,7 @@ Name[gl]=Compacta Name[id]=Sederhana Name[it]=Compatta Name[ko]=축소됨 +Name[lt]=Kompaktiškas Name[nb]=Kompakt Name[nl]=Compact Name[pl]=Kompaktowy @@ -120,6 +123,7 @@ Name[id]=Detail Name[it]=Dettagli Name[ja]=詳細 Name[ko]=자세히 +Name[lt]=Informacija Name[nb]=Detaljer Name[nl]=Details Name[nn]=Detaljar |