From 63a5ab0b560c607effb88ab0e91a5cc6084e844f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 11 Jun 2017 04:44:09 +0200 Subject: [PATCH] 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" --- lookandfeel.dark/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index 6f87b32d..0b4d5066 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -12,7 +12,7 @@ Comment[et]=Breeze Dark töölauakujunduse keel KDE VDG-lt Comment[eu]=Breeze Dark mahaingain diseinurako lengoaia KDE VDG-k egina Comment[fi]=Työpöydän design-kieli Breeze Dark KDE VDG:ltä Comment[fr]=Thème sombre pour Brise, réalisé par KDE VDG -Comment[gl]=Linguaxe de deseño do escritorio para Breeze Dark do KDE VDG +Comment[gl]=Linguaxe de deseño do escritorio para Breeze Dark de KDE VDG Comment[he]=שפת העיצוב Breeze Dark על ידי KDE VDG Comment[hu]=Breeze Dark asztali tervezőnyelv a KDE VDG-től Comment[it]=Breeze Dark Desktop Design Language dal KDE VDG