Commit 2ac45cff 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 f62de2e8
Pipeline #64124 skipped
......@@ -34,6 +34,7 @@ Name[sl]=UserFeedBack
Name[sv]=Användaråterkoppling
Name[uk]=Відгуки користувача
Name[x-test]=xxUserFeedBackxx
Name[zh_CN]=用户反馈
Comment=KOrganizer UserFeedBack Configuration
Comment[ca]=Configuració de l'UserFeedBack per al KOrganizer
Comment[ca@valencia]=Configuració de l'UserFeedBack per al KOrganizer
......@@ -56,6 +57,7 @@ Comment[sl]=Nastavitve uporabniškega povratnega odziva za KOrganizer
Comment[sv]=Inställning av Korganizer användaråterkoppling
Comment[uk]=Налаштовування відгуків користувача у KOrganizer
Comment[x-test]=xxKOrganizer UserFeedBack Configurationxx
Comment[zh_CN]=KOrganizer 用户反馈配置
X-KDE-Keywords=korganizer,userfeedback
X-KDE-Keywords[ca]=korganizer,userfeedback
X-KDE-Keywords[ca@valencia]=korganizer,userfeedback
......@@ -78,3 +80,4 @@ X-KDE-Keywords[sl]=korganizer,uporabnikov odziv
X-KDE-Keywords[sv]=korganizer,användaråterkoppling
X-KDE-Keywords[uk]=korganizer,userfeedback,відгуки,дані
X-KDE-Keywords[x-test]=xxkorganizerxx,xxuserfeedbackxx
X-KDE-Keywords[zh_CN]=korganizer,userfeedback,用户反馈
......@@ -209,7 +209,7 @@ GenericName[uz]=Shaxsiy organayzer
GenericName[uz@cyrillic]=Шахсий органайзер
GenericName[wa]=Organizeu da sinne
GenericName[x-test]=xxPersonal Organizerxx
GenericName[zh_CN]=个人日程安排
GenericName[zh_CN]=个人日程安排工具
GenericName[zh_TW]=個人行程組織軟體
X-KDE-StartupNotify=true
X-DBUS-StartupType=Unique
......
......@@ -20,6 +20,7 @@ Name[sl]=Pogled KOrganizerja
Name[sv]=Korganizer-vy
Name[uk]=Перегляд KOrganizer
Name[x-test]=xxKOrganizer Viewxx
Name[zh_CN]=KOrganizer 视图
Comment=Display incidence specified by URL
Comment[ca]=Mostra la incidència especificada mitjançant un URL
Comment[ca@valencia]=Mostra la incidència especificada mitjançant un URL
......@@ -40,6 +41,7 @@ Comment[sl]=Prikazovanje pojavnosti, določeno z URL-jem
Comment[sv]=Visa förekomst angiven enligt webbadress
Comment[uk]=Показати подію, яку вказано за допомогою адреси
Comment[x-test]=xxDisplay incidence specified by URLxx
Comment[zh_CN]=显示由 URL 指定的事件
Type=Application
Exec=korganizer --view %u
Icon=korganizer
......
......@@ -209,7 +209,7 @@ GenericName[uz]=Shaxsiy organayzer
GenericName[uz@cyrillic]=Шахсий органайзер
GenericName[wa]=Organizeu da sinne
GenericName[x-test]=xxPersonal Organizerxx
GenericName[zh_CN]=个人日程安排
GenericName[zh_CN]=个人日程安排工具
GenericName[zh_TW]=個人行程組織軟體
StartupNotify=true
X-DBUS-StartupType=Unique
......
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