diff options
| author | l10n daemon script <[email protected]> | 2018-03-03 05:23:49 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-03-03 05:23:49 +0100 |
| commit | e46421bfeee7a2d4f8f61c24feee2758325e86a4 (patch) | |
| tree | 3005a0e4df2ad3ae3010b2a400e0bbe31b25e23a /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | b95cc59091f9b538f87b616b92e91d6aace0e1be (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 195b4d2a3..467437c1f 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 berkas +Comment[id]=Konfigurasi layanan pengelola fail 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 berkas +X-KDE-Keywords[id]=pengelola fail X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[ja]=ファイルマネージャ X-KDE-Keywords[ko]=파일 관리자 |