Commit 7eed738e authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 7b5243f4
......@@ -61,7 +61,7 @@ Keywords[hu]=Asztal;Munkaterület;Megjelenés;Kinézet;Kijelentkezés;Zárolás;
Keywords[ia]=Scriptorio;Spatio de labor;Apparentia;Look and Feel;Logout;Lock;Suspende;Shutdown;Hibernate;
Keywords[id]=Desktop;Workspace;Penampilan;Look and Feel;Logout;Kunci;Suspensi;Mematikan;Hibernasi;
Keywords[it]=Desktop;spazio di lavoro;aspetto;chiusura della sessione;blocco;sospensione;spegnimento;ibernazione;
Keywords[ko]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;데스크톱;작업공간;모양;로그아웃;잠금;대기모드;종료;끄기;최대절전모드;
Keywords[ko]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;데스크톱;작업공간;모양;로그아웃;잠금;대기모드;종료;끄기;최대절전모드;절전;
Keywords[lt]=Darbalaukis;Erdvė;Erdve;Sritis;Išvaizda;Isvaizda;Išvaizda ir turinys;Isvaizda ir turinys;Turinys;Atsijungti;Užrakinti;Uzrakinti;Užmigdyti;Uzmigdyti;Išjungti;Isjungti;Hibernuoti;Sustabdyti;Pristabdyti;
Keywords[nl]=Bureaublad;werkruimte;uiterlijk;uiterlijk en gedrag;afmelden;vergrendelen;onderbreken;afsluiten;slapen;
Keywords[nn]=skrivebord;arbeidsområde;arbeidsflate;utsjånad;åtferd;utlogging;lås;dvalemodus;kvilemodus;avslutting;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment