Commit b24d9f2d 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 b8902865
......@@ -2,6 +2,7 @@
Comment=On-Screen Ruler
Comment[ar]=مسطرة الشاشة
Comment[ast]=Regla na pantalla
Comment[bg]=Линийка за екрана
Comment[bs]=Ekranski lenjir
Comment[ca]=Regle de pantalla
......@@ -58,6 +59,7 @@ 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
......@@ -125,6 +127,7 @@ Name[zh_TW]=以游標移動
Comment=The ruler has moved pixelwise using the cursor keys
Comment[af]=Die liniaal het verskuif beeldelement-gewys te gebruik Die plekaanduier sleutels
Comment[ar]=المسطرة تحركت في اتجاه البكسل باستخدام مفاتيح المؤشر
Comment[ast]=La regla movióse píxel a píxel usando les tecles del cursor
Comment[bg]=Линийката е преместена на ниво пиксели чрез клавишите
Comment[bs]=Lenjir je pomjeren za piksel pokazivačkim tasterima
Comment[ca]=El regle es mou píxel a píxel amb les tecles de cursor
......@@ -2,6 +2,7 @@
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
......@@ -76,6 +77,7 @@ GenericName[zh_TW]=螢幕尺規
Name[ar]=مسطرة ك
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