Commit cde28d76 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 03d19b7e
...@@ -59,6 +59,7 @@ Name[tr]=KGeography ...@@ -59,6 +59,7 @@ Name[tr]=KGeography
Name[ug]=KGeography Name[ug]=KGeography
Name[uk]=KGeography Name[uk]=KGeography
Name[vi]=Địa lý K Name[vi]=Địa lý K
Name[zh_CN]=KGeography Name[zh_CN]=KGeography
Name[zh_TW]=地理_KGeography Name[zh_TW]=地理_KGeography
GenericName=Geography Trainer GenericName=Geography Trainer
...@@ -119,6 +120,7 @@ GenericName[tr]=Coğrafya Çalıştırıcı ...@@ -119,6 +120,7 @@ GenericName[tr]=Coğrafya Çalıştırıcı
GenericName[ug]=جۇغراپىيە مەشقاۋۇلى GenericName[ug]=جۇغراپىيە مەشقاۋۇلى
GenericName[uk]=Тренування знань з географії GenericName[uk]=Тренування знань з географії
GenericName[vi]=Luyện tập Địa lý GenericName[vi]=Luyện tập Địa lý
GenericName[x-test]=xxGeography Trainerxx
GenericName[zh_CN]=地理老师 GenericName[zh_CN]=地理老师
GenericName[zh_TW]=地理知識 GenericName[zh_TW]=地理知識
Comment=A Geography Learning Program Comment=A Geography Learning Program
...@@ -179,6 +181,7 @@ Comment[tr]=Bir Coğrafya Öğrenme Uygulaması ...@@ -179,6 +181,7 @@ Comment[tr]=Bir Coğrafya Öğrenme Uygulaması
Comment[ug]=جۇغراپىيە ئۆگىنىش پروگراممىسى Comment[ug]=جۇغراپىيە ئۆگىنىش پروگراممىسى
Comment[uk]=Програма для вивчення географії Comment[uk]=Програма для вивчення географії
Comment[vi]=Một Chương trình giúp Học Địa lý Comment[vi]=Một Chương trình giúp Học Địa lý
Comment[x-test]=xxA Geography Learning Programxx
Comment[zh_CN]=地理学习程序 Comment[zh_CN]=地理学习程序
Comment[zh_TW]=學習地理的程式 Comment[zh_TW]=學習地理的程式
Exec=kgeography Exec=kgeography
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