From: l10n daemon script Date: Sat, 21 Nov 2015 18:58:19 +0000 (+0000) Subject: SVN_SILENT made messages (.desktop file) - always resolve ours X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/0587f994dc408e9ea98b0007f44179e2e4b6d4d0 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" --- diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index c8d3cca11..e529f16ab 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -47,6 +47,7 @@ X-KDE-PluginKeyword=dolphinservices X-KDE-ParentApp=kcontrol X-DocPath=dolphin/index.html#preferences-dialog-services Name=Services +Name[ast]=Servicios Name[ca]=Serveis Name[ca@valencia]=Serveis Name[cs]=Služby