diff options
| author | l10n daemon script <[email protected]> | 2015-11-01 10:40:09 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-11-01 10:40:09 +0000 |
| commit | 7b273bb4c66de0d2c4f53bcffa418839eb3b5972 (patch) | |
| tree | 1ef2d94f67e6dec63de0dba6e1559853307133f4 /src/dolphinpart.desktop | |
| parent | 07dae709d9fe68283caa71d13468b3edc4f0e2be (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 5d8f511eb..24f258d2a 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -20,6 +20,7 @@ Name[lt]=Dolphin žiūryklė Name[nb]=Dolphin visning Name[nl]=Dolphin-weergave Name[nn]=Dolphin-vising +Name[pa]=ਡਾਲਫਿਨ ਝਲਕ Name[pl]=Widok Dolphina Name[pt]=Área do Dolphin Name[pt_BR]=Visualização do Dolphin @@ -71,6 +72,7 @@ Name[lt]=Piktogramos Name[nb]=Ikoner Name[nl]=Pictogrammen Name[nn]=Ikon +Name[pa]=ਆਈਕਾਨ Name[pl]=Ikony Name[pt]=Ícones Name[pt_BR]=Ícones @@ -111,6 +113,7 @@ Name[ko]=축소됨 Name[lt]=Kompaktiškas Name[nb]=Kompakt Name[nl]=Compact +Name[pa]=ਸੰਖਿਪਤ Name[pl]=Kompaktowy Name[pt]=Compacta Name[pt_BR]=Compacto @@ -152,6 +155,7 @@ Name[lt]=Informacija Name[nb]=Detaljer Name[nl]=Details Name[nn]=Detaljar +Name[pa]=ਵੇਰਵੇ Name[pl]=Szczegóły Name[pt]=Detalhes Name[pt_BR]=Detalhes |