Commit 37ef18ac 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 34047117
[Desktop Entry] [Desktop Entry]
Name=DBUSCalendar Name=DBUSCalendar
Name[ar]=التقويم DBUS Name[ar]=التقويم DBUS
Name[bg]=DBUSCalendar Name[bg]=DBUSCalendar
Name[bs]=DBUSKalendar Name[bs]=DBUSKalendar
Name[ca]=DBUSCalendar Name[ca]=DBUSCalendar
...@@ -15,7 +15,6 @@ X-DocPath=korganizer/index.html#config-main-fonts ...@@ -15,7 +15,6 @@ X-DocPath=korganizer/index.html#config-main-fonts
Name=Colors and Fonts Name=Colors and Fonts
Name[ar]=الألوان و الخطوط Name[ar]=الألوان و الخطوط
Name[ast]=Colores y fontes
Name[bs]=Boje i vrsta slova Name[bs]=Boje i vrsta slova
Name[ca]=Colors i tipus de lletra Name[ca]=Colors i tipus de lletra
Name[ca@valencia]=Colors i tipus de lletra Name[ca@valencia]=Colors i tipus de lletra
...@@ -16,7 +16,6 @@ X-DocPath=korganizer/index.html#config-main ...@@ -16,7 +16,6 @@ X-DocPath=korganizer/index.html#config-main
Name=General Name=General
Name[af]=Algemeen Name[af]=Algemeen
Name[ar]=عام Name[ar]=عام
Name[be]=Агульныя Name[be]=Агульныя
Name[bg]=Общи Name[bg]=Общи
Name[br]=Pennañ Name[br]=Pennañ
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