diff options
| author | l10n daemon script <[email protected]> | 2018-04-03 05:25:54 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-04-03 05:25:54 +0200 |
| commit | aee551e80b5feca5e8a320115424d889057312a0 (patch) | |
| tree | 930794153a5b846dd4dd67168c51b12c4d400dbe /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | 1441fefc07f126c1c9eddc3e9f1babff8b762b28 (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/settings/kcm/kcmdolphinservices.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.desktop | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 467437c1f..e6d9e2feb 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -110,7 +110,7 @@ Comment[fr]=Configuration des services du gestionnaire de fichiers Comment[gl]=Configurar servizos de xestores de ficheiros. Comment[hu]=A fájlkezelő szolgáltatásainak beállítása Comment[ia]=Configura servicios del gerente de file -Comment[id]=Konfigurasi layanan pengelola fail +Comment[id]=Konfigurasi layanan pengelola file Comment[it]=Configura i servizi del gestore dei file Comment[ja]=ファイルマネージャのサービスを設定します Comment[ko]=파일 관리자 서비스 설정 @@ -153,7 +153,7 @@ X-KDE-Keywords[gl]=xestor de ficheiros X-KDE-Keywords[he]=מנהל קבצים X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file -X-KDE-Keywords[id]=pengelola fail +X-KDE-Keywords[id]=pengelola file X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[ja]=ファイルマネージャ X-KDE-Keywords[ko]=파일 관리자 |