Commit b8902865 authored by Script Kiddy's avatar Script Kiddy

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 b17faa0c
......@@ -2,7 +2,6 @@
IconName=kruler
Comment=On-Screen Ruler
Comment[ar]=مسطرة الشاشة
Comment[ast]=Regla na pantalla
Comment[bg]=Линийка за екрана
Comment[bs]=Ekranski lenjir
Comment[ca]=Regle de pantalla
......@@ -59,7 +58,6 @@ Comment[zh_TW]=螢幕尺規
Name=Moved by Cursor Keys
Name[af]=Verskuif deur Plekaanduier Sleutels
Name[ar]=حُرّك بمفاتيح المؤشر
Name[ast]=Movida poles tecles de cursor
Name[bg]=Преместване с клавиши
Name[bs]=Pomjeren pokazivačkim tasterima
Name[ca]=Es mou amb les tecles de cursor
......
......@@ -2,7 +2,6 @@
GenericName=Screen Ruler
GenericName[af]=Skerm Liniaal
GenericName[ar]=مسطرة الشاشة
GenericName[ast]=Regla de pantalla
GenericName[bg]=Линийка за екрана
GenericName[bs]=Ekranski lenjir
GenericName[ca]=Regle de pantalla
......@@ -77,7 +76,6 @@ GenericName[zh_TW]=螢幕尺規
Name=KRuler
Name[af]=K-lineaal
Name[ar]=مسطرة ك
Name[ast]=KRuler
Name[bg]=KRuler
Name[br]=KRuler
Name[bs]=K‑lenjir
......
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