diff options
| author | l10n daemon script <[email protected]> | 2015-04-04 11:02:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-04-04 11:02:00 +0000 |
| commit | 4e96b1a42f7718d7c2401e5abed3e30267f7e0ea (patch) | |
| tree | bd7347e3f0f25b217f16765c83f708f4bab549ea /src/dolphinpart.desktop | |
| parent | de84f223d4408dc1eaf6f15ebeed2e8acf49ad4c (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 88329e7c6..7fb47c3d2 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -15,6 +15,7 @@ Name[pl]=Widok Dolphina Name[pt]=Área do Dolphin Name[pt_BR]=Visualização do Dolphin Name[sk]=Dolphin pohľad +Name[sl]=Dolphin - pogled Name[sr]=Делфинов приказ Name[sr@ijekavian]=Делфинов приказ Name[sr@ijekavianlatin]=Dolphinov prikaz @@ -52,6 +53,7 @@ Name[pl]=Ikony Name[pt]=Ícones Name[pt_BR]=Ícones Name[sk]=Ikony +Name[sl]=Ikone Name[sr]=Иконе Name[sr@ijekavian]=Иконе Name[sr@ijekavianlatin]=Ikone @@ -80,6 +82,7 @@ Name[pl]=Kompaktowy Name[pt]=Compacta Name[pt_BR]=Compacto Name[sk]=Kompaktný +Name[sl]=Strnjeno Name[sr]=Сажето Name[sr@ijekavian]=Сажето Name[sr@ijekavianlatin]=Sažeto @@ -108,6 +111,7 @@ Name[pl]=Szczegóły Name[pt]=Detalhes Name[pt_BR]=Detalhes Name[sk]=Podrobnosti +Name[sl]=Podrobnosti Name[sr]=Детаљи Name[sr@ijekavian]=Детаљи Name[sr@ijekavianlatin]=Detalji |