mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
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"
This commit is contained in:
parent
a9ddcf726d
commit
babb8587f8
1 changed files with 2 additions and 2 deletions
|
|
@ -41,7 +41,7 @@
|
|||
}
|
||||
],
|
||||
"Description": "Hotspot quick setting for Plasma Mobile",
|
||||
"Description[ar]": "إعداد سريع للنقطة الفعالة لبلازما الجوال",
|
||||
"Description[ar]": "إعداد سريع لنقطة اتصال لبلازما الجوال",
|
||||
"Description[ca@valencia]": "Configuració ràpida del punt d'accés per a Plasma Mobile",
|
||||
"Description[ca]": "Configuració ràpida del punt d'accés per al Plasma Mobile",
|
||||
"Description[cs]": "Rychlé nastavení Plasma pro mobilní telefony",
|
||||
|
|
@ -80,7 +80,7 @@
|
|||
"Id": "org.kde.plasma.quicksetting.hotspot",
|
||||
"License": "GPL-2.0+",
|
||||
"Name": "Hotspot",
|
||||
"Name[ar]": "هوت-سبوت",
|
||||
"Name[ar]": "نقطة اتصال",
|
||||
"Name[ca@valencia]": "Punt d'accés",
|
||||
"Name[ca]": "Punt d'accés",
|
||||
"Name[cs]": "Hotspot",
|
||||
|
|
|
|||
Loading…
Reference in a new issue