Commit f010b18a 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 7fb261c9
......@@ -160,7 +160,7 @@ Comment[zh_TW]=鎖定螢幕或登出
Encoding=UTF-8
Keywords=Lock;Logout;Sleep;Hibernate;Switch User;
Keywords[bs]=Zaključavanje;Odjava;Spavanje;Hibernacija;Promjena korisnika;
Keywords[ca]=Bloqueig;Sortida;Suspensió;Hibernació;Canvi d'usuari;
Keywords[ca]=Bloqueig;Sortida;Adorm;Hiberna;Canvi d'usuari;
Keywords[ca@valencia]=Bloqueig;Eixida;Suspensió;Hibernació;Canvi d'usuari;
Keywords[da]=Lås;Log ud;Slumre;Dvale;Suspend;Skift bruger;suspender;
Keywords[de]=Sperren;Abmelden;Standby;Ruhezustand;Tiefschlaf;Benutzer wechseln;
......
......@@ -72,7 +72,7 @@ Name[zh_TW]=電源管理
Comment=Battery, AC, sleep and PowerDevil information.
Comment[bg]=Данни за батерия, AC, приспиване и PowerDevil
Comment[bs]=Podaci iz Strujnog đavola o bateriji, AC‑u, i spavanju.
Comment[ca]=Informació de la bateria, AC, suspensió i del PowerDevil.
Comment[ca]=Informació de la bateria, AC, adorm i del PowerDevil.
Comment[ca@valencia]=Informació de la bateria, AC, suspensió i del PowerDevil.
Comment[cs]=Informace o baterii, AC a uspání.
Comment[da]=Information om batteri, strømforsyning, dvale og PowerDevil.
......
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