From 17f808db9a1855b39052da652e65fe473023004a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 14 Mar 2015 10:20:33 +0000 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" --- kcmkwin/kwindesktop/desktop.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop index f264eae70e..4b3d65b26a 100644 --- a/kcmkwin/kwindesktop/desktop.desktop +++ b/kcmkwin/kwindesktop/desktop.desktop @@ -93,7 +93,7 @@ Comment[lt]=Naršymas, Skaičius ir išdėstymas virtualių darbastalių Comment[nb]=Navigering, antall og utlegg av virtuelle skrivebord Comment[nds]=Tall, Anornen un dat Anstüern vun de virtuellen Schriefdischen fastleggen Comment[nl]=Navigatie door, aantal en indeling van virtuele bureaubladen -Comment[pl]=Poruszanie się, liczba i układ wyobrażalnych pulpitów +Comment[pl]=Poruszanie się, liczba i układ wirtualnych pulpitów Comment[pt]=Navegação, Número e Disposição dos Ecrãs Virtuais Comment[pt_BR]=Navegação, quantidade e leiaute das áreas de trabalho virtuais Comment[ru]=Число, расположение и способ переключения рабочих столов