diff options
| author | l10n daemon script <[email protected]> | 2016-04-03 09:50:58 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-04-03 09:50:58 +0000 |
| commit | 0c904334781084533e699b95f9c2dde3a9833fcf (patch) | |
| tree | aaf9e85b1d5e80f8d396e50886edcc665ccefab5 | |
| parent | 32db592309eeb3473d1e7b31fe2ffe0fd2be7947 (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"
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index f421ae5c6..1a1f7e7bb 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -21,6 +21,7 @@ Name[lt]=Dolphin rodymo būdai Name[nb]=Dolphin visningsmåter Name[nl]=Dolphin-weergavemodussen Name[nn]=Dolphin-visingar +Name[pa]=ਡਾਲਫਿਨ ਝਲਕ ਢੰਗ Name[pl]=Tryby widoku Dolphina Name[pt]=Modos de Visualização do Dolphin Name[pt_BR]=Modos de exibição do Dolphin |