diff options
| author | l10n daemon script <[email protected]> | 2022-05-01 03:11:08 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-01 03:11:08 +0000 |
| commit | 2834e581e0b734e24f2e3010c4a1bc3c41e2e78a (patch) | |
| tree | 2ac9171d8946f9fc1a1d17a83611a9eb4b7e34aa /src | |
| parent | cef7ea3be6d94bc23cc3c6e91fa3010838614945 (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')
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.desktop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 6824b74ea..4374c84d7 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -147,7 +147,7 @@ Name[pa]=ਵੇਖਣ ਢੰਗ Name[pl]=Tryby widoku Name[pt]=Modos de Visualização Name[pt_BR]=Modos de exibição -Name[ro]=Moduri de vizualizare +Name[ro]=Regimuri de vizualizare Name[ru]=Режимы просмотра Name[se]=Čájehanmodusat Name[sk]=Režimy zobrazenia |