From e1a7bbf5eebef350cb3d5d0c91ebc6c2b18e324c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 10 Jan 2021 06:50:48 +0100 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" --- applets/lock_logout/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applets/lock_logout/metadata.desktop b/applets/lock_logout/metadata.desktop index 64020e309..98f85b5f5 100644 --- a/applets/lock_logout/metadata.desktop +++ b/applets/lock_logout/metadata.desktop @@ -200,7 +200,7 @@ Keywords[sr@ijekavian]=Lock;Logout;Sleep;Hibernate;Switch User;закључав Keywords[sr@ijekavianlatin]=Lock;Logout;Sleep;Hibernate;Switch User;zaključavanje;odjavljivanje;spavanje;hibernacija;prebacivanje; Keywords[sr@latin]=Lock;Logout;Sleep;Hibernate;Switch User;zaključavanje;odjavljivanje;spavanje;hibernacija;prebacivanje; Keywords[sv]=Lås;Utloggning;Viloläge;Dvala;Byt användare; -Keywords[tr]=Kilitle;Oturumu Kapat;Uyku;Askıya Al;Kullanıcı Değiştir; +Keywords[tr]=Kilitle;Oturumu Kapat;Beklet;Askıya Al;Kullanıcı Değiştir; Keywords[uk]=Lock;Logout;Sleep;Hibernate;Switch User;блокування;вихід;присипляння;сон;перемикання;користувач; Keywords[vi]=Lock;Logout;Sleep;Hibernate;Switch User;Khoá;Đăng xuất;Ngủ;Ngủ đông;Chuyển người dùng; Keywords[x-test]=xxLockxx;xxLogoutxx;xxSleepxx;xxHibernatexx;xxSwitch Userxx;