Commit 2675b088 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 72014998
......@@ -20,6 +20,7 @@ Name[sr@latin]=I‑kalendarski fajl
Name[sv]=iCal-kalenderfil
Name[uk]=Файл календаря iCal
Name[x-test]=xxiCal Calendar Filexx
Name[zh_TW]=iCal 行事曆檔案
Comment=Loads data from an iCal file
Comment[ar]=تحميل البيانات من ملف ICal
Comment[bg]=Зареждане на данни от файл iCal
......
......@@ -20,6 +20,7 @@ Name[sr@latin]=I‑kalendarski fajl
Name[sv]=iCal-kalenderfil
Name[uk]=Файл календаря iCal
Name[x-test]=xxiCal Calendar Filexx
Name[zh_TW]=iCal 行事曆檔案
Icon=text-calendar
Comment=Loads data from an iCal file
Comment[ar]=تحميل البيانات من ملف ICal
......
......@@ -20,6 +20,7 @@ Name[sr@latin]=I‑kalendarski fascikla
Name[sv]=iCal-kalenderkatalog
Name[uk]=Тека календаря iCal
Name[x-test]=xxiCal Calendar Folderxx
Name[zh_TW]=iCal 行事曆資料夾
Comment="Provides access to calendar items, each stored in a single file, in a given directory"
Comment[bs]="Puža pristup stavkama kalendara, svaka u pojedinoh datoteci u datom direktoriju"
Comment[ca]=«Proporciona accés als elements d'un calendari, cadascun emmagatzemat en un fitxer individual, en un directori proporcionat»
......
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