diff options
| author | l10n daemon script <[email protected]> | 2015-04-24 09:52:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-04-24 09:52:38 +0000 |
| commit | 0daae5336714c2124171ca89415eb8bf6098519d (patch) | |
| tree | 70ecc703522ecc885f3c7b029674e33727581dcf /src/dolphinpart.desktop | |
| parent | 975d0d7bfa2994fd5d13f40a70ea0851c702674f (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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 7fb47c3d2..52412b9b9 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -11,6 +11,7 @@ Name[gl]=Vista de Dolphin Name[id]=Tampilan Dolphin Name[it]=Vista di Dolphin Name[nl]=Dolphin-weergave +Name[nn]=Dolphin-vising Name[pl]=Widok Dolphina Name[pt]=Área do Dolphin Name[pt_BR]=Visualização do Dolphin @@ -49,6 +50,7 @@ Name[gl]=Iconas Name[id]=Ikon Name[it]=Icone Name[nl]=Pictogrammen +Name[nn]=Ikon Name[pl]=Ikony Name[pt]=Ícones Name[pt_BR]=Ícones @@ -107,6 +109,7 @@ Name[gl]=Detalles Name[id]=Detail Name[it]=Dettagli Name[nl]=Details +Name[nn]=Detaljar Name[pl]=Szczegóły Name[pt]=Detalhes Name[pt_BR]=Detalhes |